diff options
| author |  René Scharfe <l.s.r@web.de> | 2019-11-26 16:18:28 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-11-27 11:18:39 +0900 |
| commit | 1768aaf01d3f57af8c4182d5887d219456f4a094 (patch) | |
| tree | 163a8f5c4202b4b65c8d7f703cd0c0972203271a | |
| parent | shell: use skip_prefix() instead of starts_with() (diff) | |
| download | tgif-1768aaf01d3f57af8c4182d5887d219456f4a094.tar.xz | |
push: use skip_prefix() instead of starts_with()
Get rid of a magic number by using skip_prefix().
Signed-off-by: René Scharfe <l.s.r@web.de>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/push.c | 5 |
1 files changed, 3 insertions, 2 deletions
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", |