From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>,
Philip Oakley <philipoakley@iee.email>,
Alex Henrie <alexhenrie24@gmail.com>, Jeff King <peff@peff.net>,
Junio C Hamano <gitster@pobox.com>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH 2/3] pull: trivial cleanup
Date: Sat, 12 Jun 2021 23:59:48 -0500 [thread overview]
Message-ID: <20210613045949.255090-3-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210613045949.255090-1-felipe.contreras@gmail.com>
There's no need to store ran_ff. Now it's obvious from the conditionals.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
builtin/pull.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/builtin/pull.c b/builtin/pull.c
index a22293b7db..80e2f55cbc 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -1053,7 +1053,6 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
if (opt_rebase) {
int ret = 0;
- int ran_ff = 0;
struct object_id newbase;
struct object_id upstream;
@@ -1068,11 +1067,10 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
if (can_ff) {
/* we can fast-forward this without invoking rebase */
opt_ff = "--ff-only";
- ran_ff = 1;
ret = run_merge();
- }
- if (!ran_ff)
+ } else {
ret = run_rebase(&newbase, &upstream);
+ }
if (!ret && (recurse_submodules == RECURSE_SUBMODULES_ON ||
recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND))
--
2.32.0
next prev parent reply other threads:[~2021-06-13 5:00 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-13 4:59 [PATCH 0/3] pull: obvious fixes Felipe Contreras
2021-06-13 4:59 ` [PATCH 1/3] pull: cleanup autostash check Felipe Contreras
2021-06-14 14:56 ` Elijah Newren
2021-06-15 10:59 ` Felipe Contreras
[not found] ` <CAPUEspg_MmerWb7h8MyhgcJXbWrJeeSyeJ7z2S6eHgDfRDPKvA@mail.gmail.com>
2021-06-15 11:09 ` Felipe Contreras
2021-06-13 4:59 ` Felipe Contreras [this message]
2021-06-14 14:57 ` [PATCH 2/3] pull: trivial cleanup Elijah Newren
2021-06-13 4:59 ` [PATCH 3/3] pull: trivial whitespace style fix Felipe Contreras
2021-06-14 15:03 ` Elijah Newren
2021-06-14 14:47 ` [PATCH 0/3] pull: obvious fixes Elijah Newren
2021-06-15 1:25 ` Junio C Hamano
2021-06-15 10:41 ` Felipe Contreras
2021-06-17 16:17 ` [PATCH v2 " Felipe Contreras
2021-06-17 16:17 ` [PATCH v2 1/3] pull: cleanup autostash check Felipe Contreras
2021-06-17 16:17 ` [PATCH v2 2/3] pull: trivial cleanup Felipe Contreras
2021-06-17 16:17 ` [PATCH v2 3/3] pull: trivial whitespace style fix Felipe Contreras
2021-06-17 16:48 ` [PATCH v2 0/3] pull: obvious fixes Elijah Newren
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=20210613045949.255090-3-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=alexhenrie24@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=peff@peff.net \
--cc=philipoakley@iee.email \
/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).