From: Felipe Contreras Date: Sat, 29 May 2021 07:44:46 GMT Subject: [PATCH 03/15] push: reorder switch cases Message-ID: <20210529074458.1916817-4-felipe.contreras@gmail.com> In-Reply-To: <20210529071115.1908310-1-felipe.contreras@gmail.com> We want all the cases that don't do anything with a branch first, and then the rest. Will help further patches. Signed-off-by: Felipe Contreras --- builtin/push.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/builtin/push.c b/builtin/push.c index f4e919450d..c19321bb9d 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -254,11 +254,19 @@ static void setup_default_push_refspecs(struct remote *remote) int triangular = is_workflow_triangular(remote); switch (push_default) { - default: case PUSH_DEFAULT_MATCHING: refspec_append(&rs, ":"); return; + case PUSH_DEFAULT_NOTHING: + die(_("You didn't specify any refspecs to push, and " + "push.default is \"nothing\".")); + return; + default: + } + + switch (push_default) { + default: case PUSH_DEFAULT_UNSPECIFIED: case PUSH_DEFAULT_SIMPLE: setup_push_simple(remote, branch, triangular); @@ -271,11 +279,6 @@ static void setup_default_push_refspecs(struct remote *remote) case PUSH_DEFAULT_CURRENT: setup_push_current(remote, branch); return; - - case PUSH_DEFAULT_NOTHING: - die(_("You didn't specify any refspecs to push, and " - "push.default is \"nothing\".")); - return; } } -- 2.32.0.rc0