summaryrefslogtreecommitdiff
path: root/builtin/for-each-ref.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-05-21 04:45:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-05-22 16:33:08 (GMT)
commit3dbe9db01bd9c0b0701f72a631ac15b1791f6642 (patch)
treeb70424662931f9288f085918fa830299ef0f8961 /builtin/for-each-ref.c
parentadfe5d04345631299f9a4518d56c6dd3d47eb0b3 (diff)
downloadgit-3dbe9db01bd9c0b0701f72a631ac15b1791f6642.zip
git-3dbe9db01bd9c0b0701f72a631ac15b1791f6642.tar.gz
git-3dbe9db01bd9c0b0701f72a631ac15b1791f6642.tar.bz2
for-each-ref: use skip_prefix instead of starts_with
This saves us having to maintain a magic number to skip past the matched prefix. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/for-each-ref.c')
-rw-r--r--builtin/for-each-ref.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 92bd2b2..2bd19ca 100644
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -659,10 +659,12 @@ static void populate_value(struct refinfo *ref)
else if (starts_with(name, "symref"))
refname = ref->symref ? ref->symref : "";
else if (starts_with(name, "upstream")) {
+ const char *branch_name;
/* only local branches may have an upstream */
- if (!starts_with(ref->refname, "refs/heads/"))
+ if (!skip_prefix(ref->refname, "refs/heads/",
+ &branch_name))
continue;
- branch = branch_get(ref->refname + 11);
+ branch = branch_get(branch_name);
refname = branch_get_upstream(branch, NULL);
if (!refname)