push: split switch cases

We want all the cases that don't do anything with a branch first, and
then the rest. That way we will be able to get the branch and die if
there's a problem in the parent function, instead of inside the function
of each mode.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Felipe Contreras 2021-05-31 14:51:14 -05:00 committed by Junio C Hamano
parent 72739680fc
commit 04159fba42
1 changed files with 10 additions and 6 deletions

View File

@ -254,11 +254,20 @@ static void setup_default_push_refspecs(struct remote *remote)
int same_remote = is_same_remote(remote); int same_remote = is_same_remote(remote);


switch (push_default) { switch (push_default) {
default:
case PUSH_DEFAULT_MATCHING: case PUSH_DEFAULT_MATCHING:
refspec_append(&rs, ":"); refspec_append(&rs, ":");
return; return;


case PUSH_DEFAULT_NOTHING:
die(_("You didn't specify any refspecs to push, and "
"push.default is \"nothing\"."));
return;
default:
break;
}

switch (push_default) {
default:
case PUSH_DEFAULT_UNSPECIFIED: case PUSH_DEFAULT_UNSPECIFIED:
case PUSH_DEFAULT_SIMPLE: case PUSH_DEFAULT_SIMPLE:
setup_push_simple(remote, branch, same_remote); setup_push_simple(remote, branch, same_remote);
@ -271,11 +280,6 @@ static void setup_default_push_refspecs(struct remote *remote)
case PUSH_DEFAULT_CURRENT: case PUSH_DEFAULT_CURRENT:
setup_push_current(remote, branch); setup_push_current(remote, branch);
return; return;

case PUSH_DEFAULT_NOTHING:
die(_("You didn't specify any refspecs to push, and "
"push.default is \"nothing\"."));
return;
} }
} }