| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 20 Dec 2010 09:07:17 +0000 (01:07 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 20 Dec 2010 09:07:17 +0000 (01:07 -0800) | ||
| commit | 459c940f76f41e003d98c88ef1db4049fa14fa29 | |
| tree | 913143e0215ff63d2291da1b333cc6f3b76a130f | tree | snapshot |
| parent | c9156b5785c3790df00846cb0f38c3f065c0869b | commit | diff |
| parent | 9ec09b0495f5e672223025f5e681371034da2538 | commit | diff |
Merge branch 'ks/blame-worktree-textconv-cached' into next
* 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
* 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 | diff1 | | diff2 | | blob | history |