Re: [PATCH 03/15] push: reorder switch cases
- From
Junio C Hamano <gitster@pobox.com>
- Date
- May 31, 2021, 06:34 UTC
- Message-ID
- <xmqqeednwgvo.fsf@gitster.g>
- In-Reply-To
- <20210529074458.1916817-4-felipe.contreras@gmail.com>
Felipe Contreras <felipe.contreras@gmail.com> writes:
Show 32 quoted lines
> 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 <felipe.contreras@gmail.com>
> ---
> 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:This is not quite "reorder" but split into two. It is not yet clear how it helps, but hopefully we'll find out why splitting the switch into two switches is a good idea soon in a later step, so the title needs updating to sell that aspect of the change (unless it is a pointless change made by mistake that the originally-single switch got split into two, but that is unlikely the case ;-).
Show 14 quoted lines
> 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;
> }
> }