undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trailer: display a trailer without its trailing newline

Browse Source 
Trailers passed to the parse_trailer() function often have
a trailing newline. When erroring out, we should display
the invalid trailer properly, that means without any
trailing newline.

Helped-by: Junio C Hamano <gitster@pobox.com>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder 2014-11-09 10:23:40 +01:00 committed by Junio C Hamano
parent 2887103b35
commit d52adf1f32
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
trailer.c
View File

@ -583,8 +583,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);