From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Dec 2010 09:07:17 +0000 (-0800)
Subject: Merge branch 'ks/blame-worktree-textconv-cached' into next
X-Git-Tag: ko-next~54
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=459c940f76f41e003d98c88ef1db4049fa14fa29;p=git.git

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
---

459c940f76f41e003d98c88ef1db4049fa14fa29