diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-05 19:00:06 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-05 19:00:06 (GMT) |
| commit | 1d93ec93970d73e57c37dffd2108dbd01761cb2c (patch) | |
| tree | b897f303b65e014e839bd51c1edec20a266ee073 /t | |
| parent | bdf204f28db5cdf5201dded37c5b40f3f432e0cf (diff) | |
| parent | 4bf256d67a85bed1e175ecc2706322eafe4489ca (diff) | |
| download | git-1d93ec93970d73e57c37dffd2108dbd01761cb2c.zip git-1d93ec93970d73e57c37dffd2108dbd01761cb2c.tar.gz git-1d93ec93970d73e57c37dffd2108dbd01761cb2c.tar.bz2 | |
Merge branch 'tb/blame-resurrect-convert-to-git' into maint
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
Diffstat (limited to 't')
| -rwxr-xr-x | t/t8003-blame-corner-cases.sh | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh index 32895e5..16f1442 100755 --- a/t/t8003-blame-corner-cases.sh +++ b/t/t8003-blame-corner-cases.sh @@ -191,12 +191,24 @@ test_expect_success 'indent of line numbers, ten lines' ' test $(grep -c " " actual) = 9 ' -test_expect_success 'blaming files with CRLF newlines' ' +test_expect_success 'setup file with CRLF newlines' ' git config core.autocrlf false && - printf "testcase\r\n" >crlffile && + printf "testcase\n" >crlffile && git add crlffile && git commit -m testcase && - git -c core.autocrlf=input blame crlffile >actual && + printf "testcase\r\n" >crlffile +' + +test_expect_success 'blame file with CRLF core.autocrlf true' ' + git config core.autocrlf true && + git blame crlffile >actual && + grep "A U Thor" actual +' + +test_expect_success 'blame file with CRLF attributes text' ' + git config core.autocrlf false && + echo "crlffile text" >.gitattributes && + git blame crlffile >actual && grep "A U Thor" actual ' |