| commit | 4d4813a52f3722854a54bab046f4abfec13ef6ae | |
| author | brian m. carlson <sandals@crustytoothpaste.net> | |
| Sat, 26 Apr 2014 23:10:40 +0000 (26 23:10 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 8 May 2014 21:43:49 +0000 (8 14:43 -0700) | ||
| tree | 2b07b4ef8e9a7ca3363912b810c6e9a04f85e24e | treesnapshot (tar.gz zip) |
| parent | 5f95c9f850b19b368c43ae399cc831b17a26a5ac | commitdiff |
blame: correctly handle files regardless of autocrlf
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 <dr.khong@gmail.com>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 <dr.khong@gmail.com>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/blame.c | diffblobblamehistory | |
| t/t8003-blame-corner-cases.sh | diffblobblamehistory |