mirror of
https://github.com/git/git
synced 2024-08-27 03:29:21 +00:00
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
This commit is contained in:
commit
4d27d8cbc4
|
@ -2095,7 +2095,6 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt,
|
||||||
if (strbuf_read(&buf, 0, 0) < 0)
|
if (strbuf_read(&buf, 0, 0) < 0)
|
||||||
die_errno("failed to read from stdin");
|
die_errno("failed to read from stdin");
|
||||||
}
|
}
|
||||||
convert_to_git(path, buf.buf, buf.len, &buf, 0);
|
|
||||||
origin->file.ptr = buf.buf;
|
origin->file.ptr = buf.buf;
|
||||||
origin->file.size = buf.len;
|
origin->file.size = buf.len;
|
||||||
pretend_sha1_file(buf.buf, buf.len, OBJ_BLOB, origin->blob_sha1);
|
pretend_sha1_file(buf.buf, buf.len, OBJ_BLOB, origin->blob_sha1);
|
||||||
|
|
|
@ -191,4 +191,13 @@ test_expect_success 'indent of line numbers, ten lines' '
|
||||||
test $(grep -c " " actual) = 9
|
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
|
test_done
|
||||||
|
|
Loading…
Reference in a new issue