From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Dec 2010 21:44:58 +0000 (-0800)
Subject: Merge branch 'ks/blame-worktree-textconv-cached' into maint
X-Git-Tag: v1.7.4-rc0~1^2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=359f34f6cc948a2ddd2c99239f24a78d560bafd0;p=git.git

Merge branch 'ks/blame-worktree-textconv-cached' into maint

* ks/blame-worktree-textconv-cached:
  fill_textconv(): Don't get/put cache if sha1 is not valid
  t/t8006: Demonstrate blame is broken when cachetextconv is on
---

359f34f6cc948a2ddd2c99239f24a78d560bafd0