From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 29 Apr 2016 21:15:58 +0000 (-0700)
Subject: Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maint
X-Git-Tag: v2.8.2~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/002dd773b0b2ff2e28a335fb879a321056c0f6e2

Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maint

When running "git blame $path" with unnormalized data in the index
for the path, the data in the working tree was blamed, even though
"git add" would not have changed what is already in the index, due
to "safe crlf" that disables the line-end conversion.  It has been
corrected.

* tb/blame-force-read-cache-to-workaround-safe-crlf:
correct blame for files commited with CRLF
---

002dd773b0b2ff2e28a335fb879a321056c0f6e2