push: remove unused code in setup_push_upstream()
Now it's not used for the simple mode. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras committed
May 31, 2021 at 14:32 UTC
7e6d72bb111b080ef37e26fbdfe080672521c570
1 file changed
+2
-8
builtin/push.c
+2
-8
@@ -186,7 +186,7 @@ static const char message_detached_head_die[] =
186
" git push %s HEAD:<name-of-remote-branch>\n");
187
188
static void setup_push_upstream(struct remote *remote, struct branch *branch,
189
- int same_remote, int simple)
189
+ int same_remote)
190
{
191
if (!branch)
192
die(_(message_detached_head_die), remote->name);
@@ -207,12 +207,6 @@ static void setup_push_upstream(struct remote *remote, struct branch *branch,
207
"to update which remote branch."),
208
remote->name, branch->name);
209
210
- if (simple) {
211
- /* Additional safety */
212
- if (strcmp(branch->refname, branch->merge[0]->src))
213
- die_push_simple(branch, remote);
214
- }
215
-
210
refspec_appendf(&rs, "%s:%s", branch->refname, branch->merge[0]->src);
211
}
212
@@ -271,7 +265,7 @@ static void setup_default_push_refspecs(struct remote *remote)
265
break;
266
267
case PUSH_DEFAULT_UPSTREAM:
274
- setup_push_upstream(remote, branch, same_remote, 0);
268
+ setup_push_upstream(remote, branch, same_remote);
269
break;
270
271
case PUSH_DEFAULT_CURRENT: