diff options
| author |  brian m. carlson <sandals@crustytoothpaste.net> | 2014-04-26 23:10:40 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-05-08 14:43:49 -0700 |
| commit | 4d4813a52f3722854a54bab046f4abfec13ef6ae (patch) | |
| tree | 2b07b4ef8e9a7ca3363912b810c6e9a04f85e24e /builtin | |
| parent | Git 1.9.0 (diff) | |
| download | tgif-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 'builtin')
| -rw-r--r-- | builtin/blame.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index e44a6bb30a..7468df4a41 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -2095,7 +2095,6 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt, if (strbuf_read(&buf, 0, 0) < 0) die_errno("failed to read from stdin"); } - convert_to_git(path, buf.buf, buf.len, &buf, 0); origin->file.ptr = buf.buf; origin->file.size = buf.len; pretend_sha1_file(buf.buf, buf.len, OBJ_BLOB, origin->blob_sha1); |