Merge branch 'bc/blame-crlf-test'

gitster · gitster · commit e934c67b6683 · 2014-06-06T11:26:50.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.

* bc/blame-crlf-test:
  blame: correctly handle files regardless of autocrlf
diff --git a/builtin/blame.c b/builtin/blame.c
@@ -2355,7 +2355,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
`@@ -2355,7 +2355,6 @@ static struct commit fake_working_tree_commit(struct diff_options opt,`
`2355`	`2355`	`if (strbuf_read(&buf, 0, 0) < 0)`
`2356`	`2356`	`die_errno("failed to read from stdin");`
`2357`	`2357`	`}`
`2358`		`- convert_to_git(path, buf.buf, buf.len, &buf, 0);`
`2359`	`2358`	`origin->file.ptr = buf.buf;`
`2360`	`2359`	`origin->file.size = buf.len;`
`2361`	`2360`	`pretend_sha1_file(buf.buf, buf.len, OBJ_BLOB, origin->blob_sha1);`