Merge branch 'ss/blame-textconv-fake-working-tree'

[thirdparty/git.git] / builtin / blame.c

diff --git a/builtin/blame.c b/builtin/blame.c
index 26a5d424b8ceb0fd403a492e46e3637fd35068ba..86c0537cbb50c0e5d6169d6d316ac37b5cc5b856 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -2113,8 +2113,10 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt,
                switch (st.st_mode & S_IFMT) {
                case S_IFREG:
                        if (DIFF_OPT_TST(opt, ALLOW_TEXTCONV) &&
-                           textconv_object(read_from, mode, null_sha1, &buf.buf, &buf_len))
+                           textconv_object(read_from, mode, null_sha1, &buf.buf, &buf_len)) {
+                               buf.alloc = buf_len;
                                buf.len = buf_len;
+                       }
                        else if (strbuf_read_file(&buf, read_from, st.st_size) != st.st_size)
                                die_errno("cannot open or read '%s'", read_from);
                        break;