mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sg/commit-cleanup-scissors'

Browse Source 
"git commit --cleanup=scissors" was not careful enough to protect
against getting fooled by a line that looked like scissors.

* sg/commit-cleanup-scissors:
  commit: cope with scissors lines in commit message
This commit is contained in:
Junio C Hamano
2015-06-24 12:21:55 -07:00
parent 712b351bd3 fbfa0973fa
commit 07528be101
2 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wt-status.c
View File

@ -825,10 +825,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);
}