Merge branch 'tb/blame-resurrect-convert-to-git'
authorJunio C Hamano <gitster@pobox.com>
Mon, 11 May 2015 21:23:52 +0000 (14:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 May 2015 21:23:52 +0000 (14:23 -0700)
commit5fa9e4c4f1582cbfdd652edac36bb76434ffb629
treeef94cc9166fe556d3ee996536257e146eb5ed58e
parent1efadd79d61b6d89a14ce8dda64c759d73769fcb
parent4bf256d67a85bed1e175ecc2706322eafe4489ca
Merge branch 'tb/blame-resurrect-convert-to-git'

Some time ago, "git blame" (incorrectly) lost the convert_to_git()
call when synthesizing a fake "tip" commit that represents the
state in the working tree, which broke folks who record the history
with LF line ending to make their project portabile across
platforms while terminating lines in their working tree files with
CRLF for their platform.

* tb/blame-resurrect-convert-to-git:
  blame: CRLF in the working tree and LF in the repo
builtin/blame.c
t/t8003-blame-corner-cases.sh