Merge branch 'rj/git-version-gen-do-not-force-abbrev'

diff --git a/builtin/commit.c b/builtin/commit.c
index 8976c3d29bf817be789f983697f7052fe5769f39..887ccc7577a12a16b40e67eb2819356e888f1965 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -790,7 +790,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
                strbuf_stripspace(&sb, 0);
 
        if (signoff)
-               append_signoff(&sb, ignore_non_trailer(&sb), 0);
+               append_signoff(&sb, ignore_non_trailer(sb.buf, sb.len), 0);
 
        if (fwrite(sb.buf, 1, sb.len, s->fp) < sb.len)
                die_errno(_("could not write commit template"));