diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-11-01 15:20:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-01 15:20:28 -0700 |
| commit | b919f8404a9e212b3b9d602d4060e440072a0303 (patch) | |
| tree | c8a2b04cb95fef931d7b75a5e6bdc0db32ac4d79 /builtin | |
| parent | Merge branch 'ef/mingw-upload-archive' (diff) | |
| parent | (squash) test for previous (diff) | |
| download | tgif-b919f8404a9e212b3b9d602d4060e440072a0303.tar.xz | |
Merge branch 'ss/blame-textconv-fake-working-tree'
* ss/blame-textconv-fake-working-tree:
(squash) test for previous
blame.c: Properly initialize strbuf after calling, textconv_object()
Conflicts:
t/t8006-blame-textconv.sh
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/blame.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index 26a5d424b8..86c0537cbb 100644 --- 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; |