diff options
| author |  Felipe Contreras <felipe.contreras@gmail.com> | 2021-05-31 14:32:35 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-06-02 10:09:52 +0900 |
| commit | b8e8b98647f02e721fc3c1b5db6936ba7c1c1167 (patch) | |
| tree | 3c59114ef25343a00df11d85981491df5c2581af /builtin | |
| parent | push: reorganize setup_push_simple() (diff) | |
| download | tgif-b8e8b98647f02e721fc3c1b5db6936ba7c1c1167.tar.xz | |
push: simplify setup_push_simple()
There's a safety check to make sure branch->refname isn't different
from branch->merge[0]->src, otherwise we die().
Therefore we always push to branch->refname.
Suggestions-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/push.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/builtin/push.c b/builtin/push.c index 972d8e1cfd..e37c751268 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -225,14 +225,10 @@ static void setup_push_current(struct remote *remote, struct branch *branch) static void setup_push_simple(struct remote *remote, struct branch *branch, int same_remote) { - const char *dst; - if (!branch) die(_(message_detached_head_die), remote->name); - if (!same_remote) { - dst = branch->refname; - } else { + if (same_remote) { if (!branch->merge_nr || !branch->merge || !branch->remote_name) die(_("The current branch %s has no upstream branch.\n" "To push the current branch and set the remote as upstream, use\n" @@ -248,10 +244,8 @@ static void setup_push_simple(struct remote *remote, struct branch *branch, int /* Additional safety */ if (strcmp(branch->refname, branch->merge[0]->src)) die_push_simple(branch, remote); - - dst = branch->merge[0]->src; } - refspec_appendf(&rs, "%s:%s", branch->refname, dst); + refspec_appendf(&rs, "%s:%s", branch->refname, branch->refname); } static int is_same_remote(struct remote *remote) |