From: Felipe Contreras Date: Sat, 29 May 2021 07:44:50 GMT Subject: [PATCH 07/15] push: trivial simplifications Message-ID: <20210529074458.1916817-8-felipe.contreras@gmail.com> In-Reply-To: <20210529071115.1908310-1-felipe.contreras@gmail.com> Signed-off-by: Felipe Contreras --- builtin/push.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/builtin/push.c b/builtin/push.c index 23b1908a5c..21968abf6e 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -205,14 +205,12 @@ static const char *get_upstream_ref(struct branch *branch, const char *remote_na static const char *setup_push_upstream(struct remote *remote, struct branch *branch, int triangular) { - const char *upstream_ref; - upstream_ref = get_upstream_ref(branch, remote->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); - return upstream_ref; + return get_upstream_ref(branch, remote->name); } static const char *setup_push_current(struct remote *remote, struct branch *branch) @@ -222,15 +220,9 @@ static const char *setup_push_current(struct remote *remote, struct branch *bran static const char *setup_push_simple(struct remote *remote, struct branch *branch, int triangular) { - if (!triangular) { - const char *upstream_ref; - - upstream_ref = get_upstream_ref(branch, remote->name); - - /* Additional safety */ - if (strcmp(branch->refname, upstream_ref)) + if (!triangular) + if (strcmp(branch->refname, get_upstream_ref(branch, remote->name))) die_push_simple(branch, remote); - } return branch->refname; } -- 2.32.0.rc0