Felipe Contreras <felipe.contreras@xxxxxxxxx> writes:
> Simply move the code around and remove dead code. In particular the
> 'trivial' conditional is a no-op since that part of the code is the
> !trivial leg of the conditional beforehand.
>
> No functional changes.
>
> Suggestions-by: Elijah Newren <newren@xxxxxxxxx>
> Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx>
> ---
> builtin/push.c | 29 ++++++++++++-----------------
> 1 file changed, 12 insertions(+), 17 deletions(-)
Much cleaner. Nice.
> diff --git a/builtin/push.c b/builtin/push.c
> index d173c39283..9c807ed707 100644
> --- a/builtin/push.c
> +++ b/builtin/push.c
> @@ -225,13 +225,14 @@ static void setup_push_current(struct remote *remote, struct branch *branch)
>
> static void setup_push_simple(struct remote *remote, struct branch *branch, int triangular)
> {
> + const char *dst;
> +
> + if (!branch)
> + die(_(message_detached_head_die), remote->name);
> +
> if (triangular) {
> - if (!branch)
> - die(_(message_detached_head_die), remote->name);
> - refspec_appendf(&rs, "%s:%s", branch->refname, branch->refname);
> + dst = branch->refname;
> } else {
> - if (!branch)
> - die(_(message_detached_head_die), remote->name);
> if (!branch->merge_nr || !branch->merge || !branch->remote_name)
> die(_("The current branch %s has no upstream branch.\n"
> "To push the current branch and set the remote as upstream, use\n"
> @@ -243,20 +244,14 @@ static void setup_push_simple(struct remote *remote, struct branch *branch, int
> if (branch->merge_nr != 1)
> die(_("The current branch %s has multiple upstream branches, "
> "refusing to push."), branch->name);
> - if (triangular)
> - die(_("You are pushing to remote '%s', which is not the upstream of\n"
> - "your current branch '%s', without telling me what to push\n"
> - "to update which remote branch."),
> - remote->name, branch->name);
> -
> - if (1) {
> - /* 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);
> + /* Additional safety */
> + if (strcmp(branch->refname, branch->merge[0]->src))
> + die_push_simple(branch, remote);
> +
> + dst = branch->merge[0]->src;
> }
> + refspec_appendf(&rs, "%s:%s", branch->refname, dst);
> }
>
> static int is_workflow_triangular(struct remote *remote)
