diff options
| author | Torsten Bögershausen <tboegi@web.de> | 2016-04-05 21:23:54 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-05 13:55:30 -0700 |
| commit | a08feb8ef0b66c3e7d398ee6169c607b8efb7c80 (patch) | |
| tree | 9370fdb4040df638fefc68800d2371cf5994e210 /t | |
| parent | 765428699a5381f113d19974720bc91b5bfeaf1d (diff) | |
| download | git-a08feb8ef0b66c3e7d398ee6169c607b8efb7c80.tar.gz git-a08feb8ef0b66c3e7d398ee6169c607b8efb7c80.tar.xz | |
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 <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t8003-blame-corner-cases.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh index 16f1442c1..b8128b633 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 |