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

Merge branch 'cc/trailers-corner-case-fix'

Browse Source 
The "interpret-trailers" helper mistook a multi-paragraph title of
a commit log message with a colon in it as the end of the trailer
block.

* cc/trailers-corner-case-fix:
  trailer: support multiline title
This commit is contained in:
Junio C Hamano
2015-09-02 12:50:21 -07:00
parent 8f8386eeb4 5c99995df8
commit cdd00dfe94
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
trailer.c
View File

@ -735,15 +735,22 @@ static int find_patch_start(struct strbuf **lines, int count)
*/
static int find_trailer_start(struct strbuf **lines, int count)
{
int start, only_spaces = 1;
int start, end_of_title, only_spaces = 1;
/* The first paragraph is the title and cannot be trailers */
for (start = 0; start < count; start++) {
if (lines[start]->buf[0] == comment_line_char)
continue;
if (contains_only_spaces(lines[start]->buf))
break;
}
end_of_title = start;
/*
* Get the start of the trailers by looking starting from the end
* for a line with only spaces before lines with one separator.
* The first line must not be analyzed as the others as it
* should be either the message title or a blank line.
*/
for (start = count - 1; start >= 1; start--) {
for (start = count - 1; start >= end_of_title; start--) {
if (lines[start]->buf[0] == comment_line_char)
continue;
if (contains_only_spaces(lines[start]->buf)) {