Merge branch 'ks/blame-worktree-textconv-cached' into maint
commit359f34f6cc948a2ddd2c99239f24a78d560bafd0
authorJunio C Hamano <gitster@pobox.com>
Tue, 28 Dec 2010 21:44:58 +0000 (28 13:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Dec 2010 21:44:58 +0000 (28 13:44 -0800)
tree36e0d7e594aea3802751c94378cec98c35a6e22d
parent58c58c8624d77ff4087ad93e515402db218684f6
parent9ec09b0495f5e672223025f5e681371034da2538
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