summaryrefslogtreecommitdiff
path: root/xdiff/xprepare.c
diff options
context:
space:
mode:
authorLibravatar brian m. carlson <sandals@crustytoothpaste.net>2014-04-26 23:10:40 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-05-08 14:43:49 -0700
commit4d4813a52f3722854a54bab046f4abfec13ef6ae (patch)
tree2b07b4ef8e9a7ca3363912b810c6e9a04f85e24e /xdiff/xprepare.c
parentGit 1.9.0 (diff)
downloadtgif-4d4813a52f3722854a54bab046f4abfec13ef6ae.tar.xz
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>
Diffstat (limited to 'xdiff/xprepare.c')
0 files changed, 0 insertions, 0 deletions