summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c5d236c)
raw | patch | inline | side by side (parent: c5d236c)
author | Marius Storm-Olsen <marius@trolltech.com> | |
Wed, 17 Oct 2007 10:57:47 +0000 (12:57 +0200) | ||
committer | Shawn O. Pearce <spearce@spearce.org> | |
Thu, 18 Oct 2007 05:41:29 +0000 (01:41 -0400) |
Pass the fake commit through convert_to_git, so that the
file is adjusted for local line-ending convention.
Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
file is adjusted for local line-ending convention.
Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
builtin-blame.c | patch | blob | history |
diff --git a/builtin-blame.c b/builtin-blame.c
index e3112a2d5bb2158bcc189942090a936c3f2b7cf6..8432b823e6ef6020a897838e7a561c3919c31f0b 100644 (file)
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -2059,6 +2059,7 @@ static struct commit *fake_working_tree_commit(const char *path, const char *con
if (strbuf_read(&buf, 0, 0) < 0)
die("read error %s from stdin", strerror(errno));
}
+ convert_to_git(path, buf.buf, buf.len, &buf);
origin->file.ptr = buf.buf;
origin->file.size = buf.len;
pretend_sha1_file(buf.buf, buf.len, OBJ_BLOB, origin->blob_sha1);