[PATCH 2/5] trailer: display a trailer without its trailing newline
- From
Christian Couder <chriscool@tuxfamily.org>
- Date
- Nov 7, 2014, 18:50 UTC
- Message-ID
- <20141107185053.16854.84253.chriscool@tuxfamily.org>
- In-Reply-To
- <20141107184148.16854.63825.chriscool@tuxfamily.org>
Trailers passed to the parse_trailer() function have a trailing newline. When erroring out, we should display the invalid trailer properly, that means without any trailing newline.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> --- trailer.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/trailer.c b/trailer.c index 761b763..f4d51ba 100644 --- a/trailer.c +++ b/trailer.c @@ -583,8 +583,12 @@ static int parse_trailer(struct strbuf *tok, struct strbuf *val, const char *tra strbuf_addch(&seps, '='); len = strcspn(trailer, seps.buf); strbuf_release(&seps); - if (len == 0) - return error(_("empty trailer token in trailer '%s'"), trailer); + if (len == 0) { + struct strbuf sb = STRBUF_INIT; + strbuf_addstr(&sb, trailer); + strbuf_rtrim(&sb); + return error(_("empty trailer token in trailer '%s'"), sb.buf); + } if (len < strlen(trailer)) { strbuf_add(tok, trailer, len); strbuf_trim(tok);
-- 2.1.2.555.gfbecd99