summaryrefslogtreecommitdiff
path: root/wt-status.c
diff options
context:
space:
mode:
authorSZEDER Gábor <szeder@ira.uka.de>2015-06-09 02:28:34 +0200
committerJunio C Hamano <gitster@pobox.com>2015-06-09 12:09:44 -0700
commitfbfa0973faf47e475854a8919097d5db29acf536 (patch)
tree549e0c519901a5ce9f33bd3d2bd5cf9a37503841 /wt-status.c
parent282616c72d1d08a77ca4fe1186cb708c38408d87 (diff)
downloadgit-fbfa0973faf47e475854a8919097d5db29acf536.tar.gz
commit: cope with scissors lines in commit messagesg/commit-cleanup-scissors
The diff and submodule shortlog appended to the commit message template by 'git commit --verbose' are not stripped when the commit message contains an indented scissors line. When cleaning up a commit message with 'git commit --verbose' or '--cleanup=scissors' the code is careful and triggers only on a pure scissors line, i.e. a line containing nothing but a comment character, a space, and the scissors cut. This is good, because people can embed scissors lines in the commit message while using 'git commit --verbose', and the text they write after their indented scissors line doesn't get deleted. While doing so, however, the cleanup function only looks at the first line matching the scissors pattern and if it doesn't start at the beginning of the line, then the function just returns without performing any cleanup. This is wrong, because a "real" scissors line added by 'git commit --verbose' might follow, and in that case the diff and submodule shortlog get included in the commit message. Fix this by changing the scissors pattern to match only at the beginning of the line, yet be careful to catch scissors on the first line as well. Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'wt-status.c')
-rw-r--r--wt-status.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/wt-status.c b/wt-status.c
index 86fec8986f..4e1f5e9647 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -844,10 +844,11 @@ void wt_status_truncate_message_at_cut_line(struct strbuf *buf)
const char *p;
struct strbuf pattern = STRBUF_INIT;
- strbuf_addf(&pattern, "%c %s", comment_line_char, cut_line);
- p = strstr(buf->buf, pattern.buf);
- if (p && (p == buf->buf || p[-1] == '\n'))
- strbuf_setlen(buf, p - buf->buf);
+ strbuf_addf(&pattern, "\n%c %s", comment_line_char, cut_line);
+ if (starts_with(buf->buf, pattern.buf + 1))
+ strbuf_setlen(buf, 0);
+ else if ((p = strstr(buf->buf, pattern.buf)))
+ strbuf_setlen(buf, p - buf->buf + 1);
strbuf_release(&pattern);
}