Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-05-12 00:23:52 +0300
committerJunio C Hamano <gitster@pobox.com>2015-05-12 00:23:52 +0300
commit5fa9e4c4f1582cbfdd652edac36bb76434ffb629 (patch)
treeef94cc9166fe556d3ee996536257e146eb5ed58e /builtin/blame.c
parent1efadd79d61b6d89a14ce8dda64c759d73769fcb (diff)
parent4bf256d67a85bed1e175ecc2706322eafe4489ca (diff)
Merge branch 'tb/blame-resurrect-convert-to-git'
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 06484c2e0e..8d70623cb8 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);