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 <felipe.contreras@xxxxxxxxx>
---
builtin/pull.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/builtin/pull.c b/builtin/pull.c
index ef23d8a52f..ad8afabe9b 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -1118,12 +1118,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, please 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, please either merge or rebase.\n"));
}
if (opt_rebase >= REBASE_TRUE) {
--
2.30.0.rc0
