Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-update'

diff --git a/trailer.c b/trailer.c
index 4b14a567b418acd3181fcf6e37f246c91d60eb60..b8088687d407eaafd6ac3f5680cebb2fe64dc80b 100644 (file)
--- 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)) {