Merge branch 'mc/git-p4-prepare-p4-only'

diff --git a/builtin/blame.c b/builtin/blame.c
index 3aa17933035604d5abc0385ea724e3710ce99235..a52a279144bec14f2b2a0795f30e0c5871f60c1b 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -2355,7 +2355,6 @@ 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);