From: Michael Haggerty <mhagger@alum.mit.edu>
To: Jeff King <peff@peff.net>
Cc: Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org, Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH 4/5] notes: fix handling of colon-separated values
Date: Sun, 4 Nov 2012 08:07:09 +0100 [thread overview]
Message-ID: <1352012830-13591-5-git-send-email-mhagger@alum.mit.edu> (raw)
In-Reply-To: <1352012830-13591-1-git-send-email-mhagger@alum.mit.edu>
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 <mhagger@alum.mit.edu>
---
notes.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/notes.c b/notes.c
index 62f8f6f..63b2a09 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);
}
--
1.8.0
next prev parent reply other threads:[~2012-11-04 7:07 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-04 7:07 [PATCH 0/5] Use string_lists when processing notes Michael Haggerty
2012-11-04 7:07 ` [PATCH 1/5] string_list: add a function string_list_remove_empty_items() Michael Haggerty
2012-11-04 7:07 ` [PATCH 2/5] Initialize sort_uniq_list using named constant Michael Haggerty
2012-11-04 7:07 ` [PATCH 3/5] combine_notes_cat_sort_uniq(): sort and dedup lines all at once Michael Haggerty
2012-11-04 7:07 ` Michael Haggerty [this message]
2012-11-04 7:07 ` [PATCH 5/5] string_list_add_refs_from_colon_sep(): use string_list_split() Michael Haggerty
2012-11-04 11:57 ` Jeff King
[not found] ` <CALKQrgebzH5vJUQVNxTks0Nq_3OZBWrb-cLDkABxnGJJqfB7gQ@mail.gmail.com>
[not found] ` <5098C29A.4010901@alum.mit.edu>
2012-11-06 14:20 ` [PATCH 0/5] Use string_lists when processing notes Johan Herland
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1352012830-13591-5-git-send-email-mhagger@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).