From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: "Elijah Newren" <newren@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Jeff King" <peff@peff.net>, "Junio C Hamano" <gitster@pobox.com>,
"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: [PATCH v3 4/7] push: reorganize setup_push_simple()
Date: Mon, 31 May 2021 14:32:34 -0500 [thread overview]
Message-ID: <20210531193237.216726-5-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210531193237.216726-1-felipe.contreras@gmail.com>
Simply move the code around and remove dead code. In particular the
'!same_remote' conditional is a no-op since that part of the code is the
same_remote leg of the conditional beforehand.
No functional changes.
Suggestions-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
builtin/push.c | 29 ++++++++++++-----------------
1 file changed, 12 insertions(+), 17 deletions(-)
diff --git a/builtin/push.c b/builtin/push.c
index 6a620a90e3..972d8e1cfd 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 same_remote)
{
+ const char *dst;
+
+ if (!branch)
+ die(_(message_detached_head_die), remote->name);
+
if (!same_remote) {
- 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 (!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);
-
- 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_same_remote(struct remote *remote)
--
2.32.0.rc0
next prev parent reply other threads:[~2021-05-31 19:33 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-31 19:32 [PATCH v3 0/7] Unconvolutize push.default=simple Felipe Contreras
2021-05-31 19:32 ` [PATCH v3 1/7] push: rename !triangular to same_remote Felipe Contreras
2021-05-31 19:32 ` [PATCH v3 2/7] push: hedge code of default=simple Felipe Contreras
2021-05-31 19:32 ` [PATCH v3 3/7] push: copy code to setup_push_simple() Felipe Contreras
2021-05-31 19:32 ` Felipe Contreras [this message]
2021-05-31 19:32 ` [PATCH v3 5/7] push: simplify setup_push_simple() Felipe Contreras
2021-05-31 19:32 ` [PATCH v3 6/7] push: remove unused code in setup_push_upstream() Felipe Contreras
2021-05-31 19:32 ` [PATCH v3 7/7] doc: push: explain default=simple correctly Felipe Contreras
2021-05-31 19:51 ` [PATCH v2 00/13] push: revamp push.default Felipe Contreras
2021-05-31 19:51 ` [PATCH v2 01/13] push: create new get_upstream_ref() helper Felipe Contreras
2021-05-31 19:51 ` [PATCH v2 02/13] push: return immediately in trivial switch case Felipe Contreras
2021-05-31 19:51 ` [PATCH v2 03/13] push: split switch cases Felipe Contreras
2021-05-31 19:51 ` [PATCH v2 04/13] push: factor out null branch check Felipe Contreras
2021-05-31 19:51 ` [PATCH v2 05/13] push: only get the branch when needed Felipe Contreras
2021-05-31 19:51 ` [PATCH v2 06/13] push: make setup_push_* return the dst Felipe Contreras
2021-05-31 19:51 ` [PATCH v2 07/13] push: trivial simplifications Felipe Contreras
2021-05-31 19:51 ` [PATCH v2 08/13] push: get rid of all the setup_push_* functions Felipe Contreras
2021-05-31 19:51 ` [PATCH v2 09/13] push: factor out the typical case Felipe Contreras
2021-05-31 19:51 ` [PATCH v2 10/13] push: remove redundant check Felipe Contreras
2021-05-31 19:51 ` [PATCH v2 11/13] push: remove trivial function Felipe Contreras
2021-05-31 19:51 ` [PATCH v2 12/13] push: only check same_remote when needed Felipe Contreras
2021-05-31 19:51 ` [PATCH v2 13/13] push: don't get a full remote object Felipe Contreras
2021-06-02 1:16 ` [PATCH v2 00/13] push: revamp push.default Junio C Hamano
2021-06-02 4:05 ` Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210531193237.216726-5-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).