summaryrefslogtreecommitdiff
path: root/trailer.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-08-28 19:32:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-08-28 19:32:17 (GMT)
commit483c9b8602eb2f4261d135c4332c4c48fa7eb8f6 (patch)
treec5c7bacbc8e7c6c4df31ef1ae4edc03fe72015b8 /trailer.c
parent038226ebc6ec1b82af639fa1d943684c07dd8f72 (diff)
parent6262fe9ca3cd61d27ca5c5599ab46d166e5b23a2 (diff)
downloadgit-483c9b8602eb2f4261d135c4332c4c48fa7eb8f6.zip
git-483c9b8602eb2f4261d135c4332c4c48fa7eb8f6.tar.gz
git-483c9b8602eb2f4261d135c4332c4c48fa7eb8f6.tar.bz2
Merge branch 'cc/trailers-corner-case-fix'
"interpret-trailers" helper mistook a single-liner log message that has a colon as the end of existing trailer. * cc/trailers-corner-case-fix: trailer: retitle a test and correct an in-comment message trailer: ignore first line of message
Diffstat (limited to 'trailer.c')
-rw-r--r--trailer.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/trailer.c b/trailer.c
index 4b14a56..b808868 100644
--- a/trailer.c
+++ b/trailer.c
@@ -740,8 +740,10 @@ 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 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 >= 0; start--) {
+ for (start = count - 1; start >= 1; start--) {
if (lines[start]->buf[0] == comment_line_char)
continue;
if (contains_only_spaces(lines[start]->buf)) {