From: Christian Couder Date: Sun, 9 Nov 2014 09:23:39 +0000 (+0100) Subject: trailer: ignore comment lines inside the trailers X-Git-Tag: v2.2.0-rc3~10^2~1 X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=2887103b35b3b40025ca5060713dfb1e1c8c3b20;p=git.git trailer: ignore comment lines inside the trailers Otherwise trailers that are commented out might be processed. We would also error out if the comment line char is also a separator. This means that comments inside a trailer block will disappear, but that was already the case anyway. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- diff --git a/trailer.c b/trailer.c index 8514566564..761b763d4d 100644 --- a/trailer.c +++ b/trailer.c @@ -804,8 +804,10 @@ static int process_input_file(struct strbuf **lines, /* Parse trailer lines */ for (i = trailer_start; i < patch_start; i++) { - struct trailer_item *new = create_trailer_item(lines[i]->buf); - add_trailer_item(in_tok_first, in_tok_last, new); + if (lines[i]->buf[0] != comment_line_char) { + struct trailer_item *new = create_trailer_item(lines[i]->buf); + add_trailer_item(in_tok_first, in_tok_last, new); + } } return patch_start;