From: Felipe Contreras Date: Mon, 31 May 2021 19:32:36 +0000 (-0500) Subject: push: remove unused code in setup_push_upstream() X-Git-Tag: v2.33.0-rc0~69^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7e6d72bb111b080ef37e26fbdfe080672521c570;p=thirdparty%2Fgit.git push: remove unused code in setup_push_upstream() Now it's not used for the simple mode. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- diff --git a/builtin/push.c b/builtin/push.c index e37c751268..29fea70ff1 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -186,7 +186,7 @@ static const char message_detached_head_die[] = " git push %s HEAD:\n"); static void setup_push_upstream(struct remote *remote, struct branch *branch, - int same_remote, int simple) + int same_remote) { if (!branch) die(_(message_detached_head_die), remote->name); @@ -207,12 +207,6 @@ static void setup_push_upstream(struct remote *remote, struct branch *branch, "to update which remote branch."), remote->name, branch->name); - if (simple) { - /* 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); } @@ -271,7 +265,7 @@ static void setup_default_push_refspecs(struct remote *remote) break; case PUSH_DEFAULT_UPSTREAM: - setup_push_upstream(remote, branch, same_remote, 0); + setup_push_upstream(remote, branch, same_remote); break; case PUSH_DEFAULT_CURRENT: