From: René Scharfe Date: Tue, 26 Nov 2019 15:18:28 +0000 (+0100) Subject: push: use skip_prefix() instead of starts_with() X-Git-Tag: v2.25.0-rc0~61^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1768aaf01d3f57af8c4182d5887d219456f4a094;p=thirdparty%2Fgit.git push: use skip_prefix() instead of starts_with() Get rid of a magic number by using skip_prefix(). Signed-off-by: René Scharfe Acked-by: Jeff King Signed-off-by: Junio C Hamano --- diff --git a/builtin/push.c b/builtin/push.c index 843f5b22a2..6dbf0f0bb7 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -64,6 +64,7 @@ static struct string_list push_options_config = STRING_LIST_INIT_DUP; static const char *map_refspec(const char *ref, struct remote *remote, struct ref *local_refs) { + const char *branch_name; struct ref *matched = NULL; /* Does "ref" uniquely name our ref? */ @@ -84,8 +85,8 @@ static const char *map_refspec(const char *ref, } if (push_default == PUSH_DEFAULT_UPSTREAM && - starts_with(matched->name, "refs/heads/")) { - struct branch *branch = branch_get(matched->name + 11); + skip_prefix(matched->name, "refs/heads/", &branch_name)) { + struct branch *branch = branch_get(branch_name); if (branch->merge_nr == 1 && branch->merge[0]->src) { struct strbuf buf = STRBUF_INIT; strbuf_addf(&buf, "%s:%s",