mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
blame: CRLF in the working tree and LF in the repo
A typical setup under Windows is to set core.eol to CRLF, and text files are marked as "text" in .gitattributes, or core.autocrlf is set to true. After4d4813a5
"git blame" no longer works as expected for such a set-up. Every line is annotated as "Not Committed Yet", even though the working directory is clean. This is because the commit removed the conversion in blame.c for all files, with or without CRLF in the repo. Having files with CRLF in the repo and core.autocrlf=input is a temporary situation, and the files, if committed as is, will be normalized in the repo, which _will_ be a notable change. Blaming them with "Not Committed Yet" is the right result. Revert commit4d4813a5
which was a misguided attempt to "solve" a non-problem. Add two test cases in t8003 to verify the correct CRLF conversion. Suggested-By: Stepan Kasal <kasal@ucw.cz> Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
282616c72d
commit
4bf256d67a
|
@ -2106,6 +2106,7 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt,
|
|||
if (strbuf_read(&buf, 0, 0) < 0)
|
||||
die_errno("failed to read from stdin");
|
||||
}
|
||||
convert_to_git(path, buf.buf, buf.len, &buf, 0);
|
||||
origin->file.ptr = buf.buf;
|
||||
origin->file.size = buf.len;
|
||||
pretend_sha1_file(buf.buf, buf.len, OBJ_BLOB, origin->blob_sha1);
|
||||
|
|
|
@ -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
|
||||
'
|
||||
|
||||
|
|
Loading…
Reference in a new issue