mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-12-04 23:44:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

push: hedge code of default=simple

Browse Source 
`simple` is the most important mode so move the relevant code to its own
function to make it easier to see what it's doing.

Reviewed-by: Elijah Newren <newren@gmail.com>
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:32 -05:00 committed by Junio C Hamano
parent 050f76b9af
commit 3b9fd8361f
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
builtin/push.c
View File

@ -223,6 +223,14 @@ static void setup_push_current(struct remote *remote, struct branch *branch)
refspec_appendf(&rs, "%s:%s", branch->refname, branch->refname);
}
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);
}
static int is_same_remote(struct remote *remote)
{
struct remote *fetch_remote = remote_get(NULL);
@ -242,10 +250,7 @@ static void setup_default_push_refspecs(struct remote *remote)
case PUSH_DEFAULT_UNSPECIFIED:
case PUSH_DEFAULT_SIMPLE:
if (!same_remote)
setup_push_current(remote, branch);
else
setup_push_upstream(remote, branch, same_remote, 1);
setup_push_simple(remote, branch, same_remote);
break;
case PUSH_DEFAULT_UPSTREAM: