Merge branch 'jk/skip-http-tests-under-no-curl' into maint

diff --git a/builtin/blame.c b/builtin/blame.c
index 06484c2e0e23237bff711bbe3cda6e1382004ef3..8d70623cb8714a87650f2425daf4ee7aaf6307a8 100644 (file)
--- 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);