diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-06 18:26:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-06 18:26:50 (GMT) |
| commit | e934c67b6683c1bd504646647b7ee04ee0d9e15b (patch) | |
| tree | aedcc0fc5925cafdd9150701fbceb19f1b5fa901 /t | |
| parent | ee8213951a36cefabed7dd653965cffb6aee628e (diff) | |
| parent | 4d4813a52f3722854a54bab046f4abfec13ef6ae (diff) | |
| download | git-e934c67b6683c1bd504646647b7ee04ee0d9e15b.zip git-e934c67b6683c1bd504646647b7ee04ee0d9e15b.tar.gz git-e934c67b6683c1bd504646647b7ee04ee0d9e15b.tar.bz2 | |
Merge branch 'bc/blame-crlf-test'
If a file contained CRLF line endings in a repository with
core.autocrlf=input, then blame always marked lines as "Not
Committed Yet", even if they were unmodified.
* bc/blame-crlf-test:
blame: correctly handle files regardless of autocrlf
Diffstat (limited to 't')
| -rwxr-xr-x | t/t8003-blame-corner-cases.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh index e7cac1d..2a3469b 100755 --- a/t/t8003-blame-corner-cases.sh +++ b/t/t8003-blame-corner-cases.sh @@ -191,4 +191,13 @@ test_expect_success 'indent of line numbers, ten lines' ' test $(grep -c " " actual) = 9 ' +test_expect_success 'blaming files with CRLF newlines' ' + git config core.autocrlf false && + printf "testcase\r\n" >crlffile && + git add crlffile && + git commit -m testcase && + git -c core.autocrlf=input blame crlffile >actual && + grep "A U Thor" actual +' + test_done |