[PATCH v2 07/13] push: trivial simplifications
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
builtin/push.c | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/builtin/push.c b/builtin/push.c
index 933b1cc6c0..43c039a2e3 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 same_remote)
{
- const char *upstream_ref;
- upstream_ref = get_upstream_ref(branch, remote->name);
if (!same_remote)
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 same_remote)
{
- if (same_remote) {
- const char *upstream_ref;
-
- upstream_ref = get_upstream_ref(branch, remote->name);
-
- /* Additional safety */
- if (strcmp(branch->refname, upstream_ref))
+ if (same_remote)
+ if (strcmp(branch->refname, get_upstream_ref(branch, remote->name)))
die_push_simple(branch, remote);
- }
return branch->refname;
}
--
2.32.0.rc0
Felipe Contreras <felipe.contreras@gmail.com>