blame: correctly handle files regardless of autocrlf

bk2204 · gitster · commit 4d4813a52f37 · 2014-05-08T14:43:49.000-07:00
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 &lt;dr.khong@gmail.com&gt;
Signed-off-by: brian m. carlson &lt;sandals@crustytoothpaste.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/blame.c b/builtin/blame.c
@@ -2095,7 +2095,6 @@ 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);
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -2095,7 +2095,6 @@ static struct commit fake_working_tree_commit(struct diff_options opt,`
`2095`	`2095`	`if (strbuf_read(&buf, 0, 0) < 0)`
`2096`	`2096`	`die_errno("failed to read from stdin");`
`2097`	`2097`	`}`
`2098`		`- convert_to_git(path, buf.buf, buf.len, &buf, 0);`
`2099`	`2098`	`origin->file.ptr = buf.buf;`
`2100`	`2099`	`origin->file.size = buf.len;`
`2101`	`2100`	`pretend_sha1_file(buf.buf, buf.len, OBJ_BLOB, origin->blob_sha1);`