| commit | a08feb8ef0b66c3e7d398ee6169c607b8efb7c80 | |
| author | Torsten Bögershausen <tboegi@web.de> | |
| Tue, 5 Apr 2016 19:23:54 +0000 (5 21:23 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 5 Apr 2016 20:55:30 +0000 (5 13:55 -0700) | ||
| tree | 9370fdb4040df638fefc68800d2371cf5994e210 | treesnapshot (tar.gz zip) |
| parent | 765428699a5381f113d19974720bc91b5bfeaf1d | commitdiff |
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>
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>
| builtin/blame.c | diffblobblamehistory | |
| t/t8003-blame-corner-cases.sh | diffblobblamehistory |