Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 29 Apr 2016 21:15:58 +0000 (14:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 29 Apr 2016 21:15:58 +0000 (14:15 -0700)
commit002dd773b0b2ff2e28a335fb879a321056c0f6e2
tree1e37d9e1e84fba91dc89cf722d0b92e920990653
parent18c554b2720a869f1203a776cadd515fc6f3f840
parenta08feb8ef0b66c3e7d398ee6169c607b8efb7c80
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
builtin/blame.c
t/t8003-blame-corner-cases.sh