From: Christian Couder Date: Fri, 07 Nov 2014 18:50:48 GMT Subject: [PATCH 1/5] trailer: ignore comment lines inside the trailers Message-ID: <20141107185053.16854.34105.chriscool@tuxfamily.org> In-Reply-To: <20141107184148.16854.63825.chriscool@tuxfamily.org> 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 --- trailer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/trailer.c b/trailer.c index 8514566..761b763 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; -- 2.1.2.555.gfbecd99