diff options
| author |  Christian Couder <christian.couder@gmail.com> | 2015-08-26 04:51:00 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-08-26 12:16:56 -0700 |
| commit | 6262fe9ca3cd61d27ca5c5599ab46d166e5b23a2 (patch) | |
| tree | 0f2b40dc19fb59d49e3369327957869f81dabd97 | |
| parent | trailer: ignore first line of message (diff) | |
| download | tgif-6262fe9ca3cd61d27ca5c5599ab46d166e5b23a2.tar.xz | |
trailer: retitle a test and correct an in-comment message
Signed-off-by: Christian Couder <christian.couder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t7513-interpret-trailers.sh | 2 | ||||
| -rw-r--r-- | trailer.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh index 33cf4d1d21..8f1f55be25 100755 --- a/t/t7513-interpret-trailers.sh +++ b/t/t7513-interpret-trailers.sh @@ -99,7 +99,7 @@ test_expect_success 'with config option on the command line' ' test_cmp expected actual ' -test_expect_success 'with message that contains only a title' ' +test_expect_success 'with only a title in the message' ' cat >expected <<-\EOF && area: change @@ -748,7 +748,8 @@ static int find_trailer_start(struct strbuf **lines, int count) /* * Get the start of the trailers by looking starting from the end * for a line with only spaces before lines with one separator. - * The start cannot be the first line. + * 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--) { if (lines[start]->buf[0] == comment_line_char) |