mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-21 03:28:41 +02:00
Code

push: remove unused code in setup_push_upstream()

Browse Source 
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>
This commit is contained in:
Felipe Contreras 2021-05-31 14:32:36 -05:00 committed by Junio C Hamano
parent b8e8b98647
commit 7e6d72bb11
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/push.c
View File

@ -186,7 +186,7 @@ static const char message_detached_head_die[] =
" git push %s HEAD:<name-of-remote-branch>\n"); " git push %s HEAD:<name-of-remote-branch>\n");
static void setup_push_upstream(struct remote *remote, struct branch *branch, static void setup_push_upstream(struct remote *remote, struct branch *branch,
int same_remote, int simple) int same_remote)
{ {
if (!branch) if (!branch)
die(_(message_detached_head_die), remote->name); 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."), "to update which remote branch."),
remote->name, branch->name); 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); 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; break;
case PUSH_DEFAULT_UPSTREAM: case PUSH_DEFAULT_UPSTREAM:
setup_push_upstream(remote, branch, same_remote, 0); setup_push_upstream(remote, branch, same_remote);
break; break;
case PUSH_DEFAULT_CURRENT: case PUSH_DEFAULT_CURRENT: