Fix off-by-one error when truncating the diff out of the commit message.

Signed-off-by: Kristian Høgsberg <krh@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-commit.c b/builtin-commit.c
index f60bd7f4dce5848ae4993753e01f88de98b391da..a35881e20b2ba8a71a047a2a264e496ceb56ff05 100644 (file)
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -765,7 +765,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
        /* Truncate the message just before the diff, if any. */
        p = strstr(sb.buf, "\ndiff --git a/");
        if (p != NULL)
-               strbuf_setlen(&sb, p - sb.buf);
+               strbuf_setlen(&sb, p - sb.buf + 1);
 
        stripspace(&sb, 1);
        if (sb.len < header_len || message_is_empty(&sb, header_len)) {