In order to avoid doing unnecessary things and simplify it in further
patches. In particular moving the additional name safety out of
setup_push_upstream() and into setup_push_simple() and thus making both
more straightforward.
The code is copied exactly as-is; no functional changes.
Reviewed-by: Elijah Newren <newren@xxxxxxxxx>
Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx>
---
builtin/push.c | 36 ++++++++++++++++++++++++++++++++----
1 file changed, 32 insertions(+), 4 deletions(-)
diff --git a/builtin/push.c b/builtin/push.c
index 48c38fe25a..6a620a90e3 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -225,10 +225,38 @@ 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)
{
- if (!same_remote)
- setup_push_current(remote, branch);
- else
- setup_push_upstream(remote, branch, same_remote, 1);
+ if (!same_remote) {
+ if (!branch)
+ die(_(message_detached_head_die), remote->name);
+ refspec_appendf(&rs, "%s:%s", branch->refname, branch->refname);
+ } else {
+ if (!branch)
+ die(_(message_detached_head_die), remote->name);
+ 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"
+ "\n"
+ " git push --set-upstream %s %s\n"),
+ branch->name,
+ remote->name,
+ branch->name);
+ if (branch->merge_nr != 1)
+ die(_("The current branch %s has multiple upstream branches, "
+ "refusing to push."), branch->name);
+ if (!same_remote)
+ die(_("You are pushing to remote '%s', which is not the upstream of\n"
+ "your current branch '%s', without telling me what to push\n"
+ "to update which remote branch."),
+ remote->name, branch->name);
+
+ if (1) {
+ /* Additional safety */
+ if (strcmp(branch->refname, branch->merge[0]->src))
+ die_push_simple(branch, remote);
+ }
+
+ refspec_appendf(&rs, "%s:%s", branch->refname, branch->merge[0]->src);
+ }
}
static int is_same_remote(struct remote *remote)
--
2.32.0.rc0
