Andrew's git / gitweb.git / diff
?
Merge branch 'ks/blame-worktree-textconv-cached' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 28 Dec 2010 21:44:58 +0000 (13:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Dec 2010 21:44:58 +0000 (13:44 -0800)
* 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

Trivial merge