From 8518088fe803131d11eade2b15796f26ae207191 Mon Sep 17 00:00:00 2001 From: Sebastian Schuberth Date: Mon, 7 Nov 2011 18:33:34 +0100 Subject: [PATCH 1/2] blame.c: Properly initialize strbuf after calling textconv_object(), again 2564aa4 started to initialize buf.alloc, but that should actually be one more byte than the string length due to the trailing \0. Also, do not modify buf.alloc out of the strbuf code. Use the existing strbuf_attach instead. Signed-off-by: Sebastian Schuberth Reviewed-by: Jeff King Signed-off-by: Junio C Hamano --- builtin/blame.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/builtin/blame.c b/builtin/blame.c index e39d9865e2..0aac73665b 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -2077,6 +2077,7 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt, if (!contents_from || strcmp("-", contents_from)) { struct stat st; const char *read_from; + char *buf_ptr; unsigned long buf_len; if (contents_from) { @@ -2094,10 +2095,8 @@ 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)) { - buf.alloc = buf_len; - buf.len = buf_len; - } + textconv_object(read_from, mode, null_sha1, &buf_ptr, &buf_len)) + strbuf_attach(&buf, buf_ptr, buf_len, buf_len + 1); else if (strbuf_read_file(&buf, read_from, st.st_size) != st.st_size) die_errno("cannot open or read '%s'", read_from); break; From 4cb6764227173a6483edbdad09121651bc0b01c3 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 7 Nov 2011 16:48:34 -0800 Subject: [PATCH 2/2] Git 1.7.8-rc1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.8.txt | 6 +++++- GIT-VERSION-GEN | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Documentation/RelNotes/1.7.8.txt b/Documentation/RelNotes/1.7.8.txt index f53845f693..1da562e715 100644 --- a/Documentation/RelNotes/1.7.8.txt +++ b/Documentation/RelNotes/1.7.8.txt @@ -139,6 +139,10 @@ included in this release. credentials. (merge deba493 jk/http-auth later to maint). + * "git blame" was aborted if started from an uncommitted content and + the path had the textconv filter in effect. + (merge 8518088 ss/blame-textconv-fake-working-tree later to maint). + * "git branch -m/-M" advertised to update RENAME_REF ref in the commit log message that introduced the feature but not anywhere in the documentation, and never did update such a ref anyway. This @@ -170,7 +174,7 @@ included in this release. --- exec >/var/tmp/1 -O=v1.7.8-rc0-32-g8e3565f +O=v1.7.8-rc0-48-g92622e6 echo O=$(git describe --always master) git log --first-parent --oneline --reverse ^$O master echo diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 56dc9d6683..cc8a3d27d5 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.8-rc0 +DEF_VER=v1.7.8-rc1 LF=' '