kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'cc/interpret-trailers' 

Small fixes to a new experimental command already in 'master'.

* cc/interpret-trailers:
  trailer: display a trailer without its trailing newline
  trailer: ignore comment lines inside the trailers
maint
Junio C Hamano 2014-11-19 13:47:49 -08:00
parent e69b1ce000 d52adf1f32
commit d4c4f18090
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
trailer.c
View File

@ -582,8 +582,12 @@ static int parse_trailer(struct strbuf *tok, struct strbuf *val, const char *tra
strbuf_addch(&seps, '='); strbuf_addch(&seps, '=');
len = strcspn(trailer, seps.buf); len = strcspn(trailer, seps.buf);
strbuf_release(&seps); strbuf_release(&seps);
if (len == 0) if (len == 0) {
return error(_("empty trailer token in trailer '%s'"), trailer); int l = strlen(trailer);
while (l > 0 && isspace(trailer[l - 1]))
l--;
return error(_("empty trailer token in trailer '%.*s'"), l, trailer);
}
if (len < strlen(trailer)) { if (len < strlen(trailer)) {
strbuf_add(tok, trailer, len); strbuf_add(tok, trailer, len);
strbuf_trim(tok); strbuf_trim(tok);
@ -803,9 +807,11 @@ static int process_input_file(struct strbuf **lines,


/* Parse trailer lines */ /* Parse trailer lines */
for (i = trailer_start; i < patch_start; i++) { for (i = trailer_start; i < patch_start; i++) {
if (lines[i]->buf[0] != comment_line_char) {
struct trailer_item *new = create_trailer_item(lines[i]->buf); struct trailer_item *new = create_trailer_item(lines[i]->buf);
add_trailer_item(in_tok_first, in_tok_last, new); add_trailer_item(in_tok_first, in_tok_last, new);
} }
}


return patch_start; return patch_start;
} }