diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-25 18:46:44 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-25 18:46:45 (GMT) |
| commit | 4d27d8cbc4ac74fee7b64ca9182ad920b958655f (patch) | |
| tree | 54c49a1ccc8e2063ceed1dc20ab7b7ef578a42c7 /t | |
| parent | 6bf84263b3be507352f2edc9397e4ca6660be289 (diff) | |
| parent | 4d4813a52f3722854a54bab046f4abfec13ef6ae (diff) | |
| download | git-4d27d8cbc4ac74fee7b64ca9182ad920b958655f.zip git-4d27d8cbc4ac74fee7b64ca9182ad920b958655f.tar.gz git-4d27d8cbc4ac74fee7b64ca9182ad920b958655f.tar.bz2 | |
Merge branch 'bc/blame-crlf-test' into maint
"git blame" assigned the blame to the copy in the working-tree if
the repository is set to core.autocrlf=input and the file used CRLF
line endings.
* 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 |