From: Torsten Bögershausen Date: Tue, 5 Apr 2016 19:23:54 +0000 (+0200) Subject: correct blame for files commited with CRLF X-Git-Tag: v2.8.2~5^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a08feb8ef0b66c3e7d398ee6169c607b8efb7c80;p=git correct blame for files commited with CRLF git blame reports lines as not "Not Committed Yet" when they have CRLF in the index, CRLF in the worktree and core.autocrlf is true. Since commit c4805393 (autocrlf: Make it work also for un-normalized repositories, 2010-05-12), files that have CRLF in the index are not normalized at commit when core.autocrl is set. Add a call to read_cache() early in fake_working_tree_commit(), before calling convert_to_git(). Signed-off-by: Torsten Bögershausen Signed-off-by: Junio C Hamano --- diff --git a/builtin/blame.c b/builtin/blame.c index 048ed53c2f..a5cabf79ea 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -2275,6 +2275,7 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt, unsigned mode; struct strbuf msg = STRBUF_INIT; + read_cache(); time(&now); commit = alloc_commit_node(); commit->object.parsed = 1; diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh index 16f1442c1e..b8128b6334 100755 --- a/t/t8003-blame-corner-cases.sh +++ b/t/t8003-blame-corner-cases.sh @@ -212,4 +212,18 @@ test_expect_success 'blame file with CRLF attributes text' ' grep "A U Thor" actual ' +test_expect_success 'blame file with CRLF core.autocrlf=true' ' + git config core.autocrlf false && + printf "testcase\r\n" >crlfinrepo && + >.gitattributes && + git add crlfinrepo && + git commit -m "add crlfinrepo" && + git config core.autocrlf true && + mv crlfinrepo tmp && + git checkout crlfinrepo && + rm tmp && + git blame crlfinrepo >actual && + grep "A U Thor" actual +' + test_done