summaryrefslogtreecommitdiff
path: root/builtin/blame.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-05 19:00:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-05 19:00:06 (GMT)
commit1d93ec93970d73e57c37dffd2108dbd01761cb2c (patch)
treeb897f303b65e014e839bd51c1edec20a266ee073 /builtin/blame.c
parentbdf204f28db5cdf5201dded37c5b40f3f432e0cf (diff)
parent4bf256d67a85bed1e175ecc2706322eafe4489ca (diff)
downloadgit-1d93ec93970d73e57c37dffd2108dbd01761cb2c.zip
git-1d93ec93970d73e57c37dffd2108dbd01761cb2c.tar.gz
git-1d93ec93970d73e57c37dffd2108dbd01761cb2c.tar.bz2
Merge branch 'tb/blame-resurrect-convert-to-git' into maint
Some time ago, "git blame" (incorrectly) lost the convert_to_git() call when synthesizing a fake "tip" commit that represents the state in the working tree, which broke folks who record the history with LF line ending to make their project portabile across platforms while terminating lines in their working tree files with CRLF for their platform. * tb/blame-resurrect-convert-to-git: blame: CRLF in the working tree and LF in the repo
Diffstat (limited to 'builtin/blame.c')
-rw-r--r--builtin/blame.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/blame.c b/builtin/blame.c
index 06484c2..8d70623 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -2348,6 +2348,7 @@ 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);