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

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
  trailer: retitle a test and correct an in-comment message
  trailer: ignore first line of message
This commit is contained in:
Junio C Hamano 2015-09-03 19:18:03 -07:00
commit 9d939886db
2 changed files with 39 additions and 3 deletions

View File

@ -93,12 +93,39 @@ test_expect_success 'with config option on the command line' '
Acked-by: Johan Acked-by: Johan
Reviewed-by: Peff Reviewed-by: Peff
EOF EOF
echo "Acked-by: Johan" | { echo; echo "Acked-by: Johan"; } |
git -c "trailer.Acked-by.ifexists=addifdifferent" interpret-trailers \ git -c "trailer.Acked-by.ifexists=addifdifferent" interpret-trailers \
--trailer "Reviewed-by: Peff" --trailer "Acked-by: Johan" >actual && --trailer "Reviewed-by: Peff" --trailer "Acked-by: Johan" >actual &&
test_cmp expected actual test_cmp expected actual
' '
test_expect_success 'with only a title in the message' '
cat >expected <<-\EOF &&
area: change
Reviewed-by: Peff
Acked-by: Johan
EOF
echo "area: change" |
git interpret-trailers --trailer "Reviewed-by: Peff" \
--trailer "Acked-by: Johan" >actual &&
test_cmp expected actual
'
test_expect_success 'with multiline title in the message' '
cat >expected <<-\EOF &&
place of
code: change
Reviewed-by: Peff
Acked-by: Johan
EOF
printf "%s\n" "place of" "code: change" |
git interpret-trailers --trailer "Reviewed-by: Peff" \
--trailer "Acked-by: Johan" >actual &&
test_cmp expected actual
'
test_expect_success 'with config setup' ' test_expect_success 'with config setup' '
git config trailer.ack.key "Acked-by: " && git config trailer.ack.key "Acked-by: " &&
cat >expected <<-\EOF && cat >expected <<-\EOF &&

View File

@ -735,13 +735,22 @@ static int find_patch_start(struct strbuf **lines, int count)
*/ */
static int find_trailer_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 * Get the start of the trailers by looking starting from the end
* for a line with only spaces before lines with one separator. * for a line with only spaces before lines with one separator.
*/ */
for (start = count - 1; start >= 0; start--) { for (start = count - 1; start >= end_of_title; start--) {
if (lines[start]->buf[0] == comment_line_char) if (lines[start]->buf[0] == comment_line_char)
continue; continue;
if (contains_only_spaces(lines[start]->buf)) { if (contains_only_spaces(lines[start]->buf)) {