[RFC PATCH 29/35] pull: reorganize mode conditionals
From: Felipe Contreras <hidden>
Date: 2021-07-05 12:33:03
Subsystem:
the rest · Maintainer:
Linus Torvalds
Now that everything is in place we can shuffle around the conditionals so it's clearer what we are trying to do. No functional changes. Signed-off-by: Felipe Contreras <redacted> --- builtin/pull.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/builtin/pull.c b/builtin/pull.c
index 295c13fbe8..cbc102ee45 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c@@ -1114,12 +1114,12 @@ int cmd_pull(int argc, const char **argv, const char *prefix) can_ff = get_can_ff(&orig_head, &merge_heads.oid[0]); - if (mode == PULL_MODE_FAST_FORWARD && !can_ff) - die(_("The pull was not fast-forward, either merge or rebase.\n")); - - if (!opt_rebase && !can_ff) { - if (opt_verbosity >= 0) + if (!can_ff) { + if (!mode && opt_verbosity >= 0) show_advice_pull_non_ff(); + + if (mode == PULL_MODE_FAST_FORWARD) + die(_("The pull was not fast-forward, either merge or rebase.\n")); } if (opt_rebase >= REBASE_TRUE) {
--
2.32.0.36.g70aac2b1aa