From 031954d443668f6ea771e389c4137628d242c2d8 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Sun, 4 Nov 2012 08:07:09 +0100 Subject: [PATCH] notes: fix handling of colon-separated values The substrings output by strbuf_split() include the ':' delimiters. When processing GIT_NOTES_DISPLAY_REF and GIT_NOTES_REWRITE_REF, strip off the delimiter character *before* checking whether the substring is empty rather than after, so that empty strings within the list are also skipped. Signed-off-by: Michael Haggerty Acked-by: Johan Herland Signed-off-by: Jeff King --- notes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/notes.c b/notes.c index 62f8f6f75b..63b2a09d47 100644 --- a/notes.c +++ b/notes.c @@ -951,10 +951,10 @@ void string_list_add_refs_from_colon_sep(struct string_list *list, split = strbuf_split(&globbuf, ':'); for (i = 0; split[i]; i++) { + if (split[i]->len && split[i]->buf[split[i]->len-1] == ':') + strbuf_setlen(split[i], split[i]->len-1); if (!split[i]->len) continue; - if (split[i]->buf[split[i]->len-1] == ':') - strbuf_setlen(split[i], split[i]->len-1); string_list_add_refs_by_glob(list, split[i]->buf); } -- 2.11.4.GIT