Code

Merge branch 'ks/blame-worktree-textconv-cached'
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Dec 2010 22:30:52 +0000 (14:30 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Dec 2010 22:30:52 +0000 (14:30 -0800)
commit6ae7a51a2e8efdb10c18d59693e647a73d98d9d3
tree80c68993f0b56ce5b0046449e6c261e6738a5890
parent3f246b1cef2c568bbac1f71c25fbf8045ff6448a
parent9ec09b0495f5e672223025f5e681371034da2538
Merge branch 'ks/blame-worktree-textconv-cached'

* 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
diff.c