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>
This commit is contained in:
Jeff King 2015-05-21 00:45:51 -04:00 committed by Junio C Hamano
parent adfe5d0434
commit 3dbe9db01b

View file

@ -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)