diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2014-04-26 23:10:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-05-08 21:43:49 (GMT) |
| commit | 4d4813a52f3722854a54bab046f4abfec13ef6ae (patch) | |
| tree | 2b07b4ef8e9a7ca3363912b810c6e9a04f85e24e /t | |
| parent | 5f95c9f850b19b368c43ae399cc831b17a26a5ac (diff) | |
| download | git-4d4813a52f3722854a54bab046f4abfec13ef6ae.zip git-4d4813a52f3722854a54bab046f4abfec13ef6ae.tar.gz git-4d4813a52f3722854a54bab046f4abfec13ef6ae.tar.bz2 | |
blame: correctly handle files regardless of autocrlf
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. Don't attempt to
convert the line endings when creating the fake commit so that blame
works correctly regardless of the autocrlf setting.
Reported-by: Ephrim Khong <dr.khong@gmail.com>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 |