summaryrefslogtreecommitdiff
path: root/builtin/blame.c
diff options
context:
space:
mode:
authorTorsten Bögershausen <tboegi@web.de>2015-05-03 16:38:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-05-03 18:00:10 (GMT)
commit4bf256d67a85bed1e175ecc2706322eafe4489ca (patch)
treeab636a9e82e47f470cbeee37044117836dd4e006 /builtin/blame.c
parent282616c72d1d08a77ca4fe1186cb708c38408d87 (diff)
downloadgit-4bf256d67a85bed1e175ecc2706322eafe4489ca.zip
git-4bf256d67a85bed1e175ecc2706322eafe4489ca.tar.gz
git-4bf256d67a85bed1e175ecc2706322eafe4489ca.tar.bz2
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. After 4d4813a5 "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 commit 4d4813a5 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>
Diffstat (limited to 'builtin/blame.c')
-rw-r--r--builtin/blame.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/blame.c b/builtin/blame.c
index eefd6bc..c69d5fa 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -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);