diff options
author | Marius Storm-Olsen <marius@trolltech.com> | 2007-10-17 12:57:47 +0200 |
---|---|---|
committer | Shawn O. Pearce <spearce@spearce.org> | 2007-10-18 01:41:29 -0400 |
commit | 8f353ee57a2f79697f8dea80ad3174998586bc75 (patch) | |
tree | 7df8bdab388bf85bcd5358e3c1110c9b52a40d5c /builtin-blame.c | |
parent | c5d236c70e043edd1033e1a132f2a594195bfd57 (diff) | |
download | git-8f353ee57a2f79697f8dea80ad3174998586bc75.tar.gz |
Teach core.autocrlf to 'git blame'
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>
Diffstat (limited to 'builtin-blame.c')
-rw-r--r-- | builtin-blame.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin-blame.c b/builtin-blame.c index e3112a2d5b..8432b823e6 100644 --- 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); |