From: Marius Storm-Olsen <marius@trolltech.com>
Date: Wed, 17 Oct 2007 10:57:47 +0000 (+0200)
Subject: Teach core.autocrlf to 'git blame'
X-Git-Tag: v1.5.4-rc0~344
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8f353ee57a2f79697f8dea80ad3174998586bc75;p=git.git

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>
---

diff --git a/builtin-blame.c b/builtin-blame.c
index e3112a2d5..8432b823e 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);