From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Dec 2010 22:30:52 +0000 (-0800)
Subject: Merge branch 'ks/blame-worktree-textconv-cached'
X-Git-Tag: v1.7.4-rc0~15
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6ae7a51a2e8efdb10c18d59693e647a73d98d9d3;p=git.git

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

6ae7a51a2e8efdb10c18d59693e647a73d98d9d3