This requires the tests to pick another base, so the merge is not
fast-forward.

Signed-off-by: Felipe Contreras <redacted>
---
 Documentation/git-pull.txt   |  3 +++
 builtin/pull.c               |  2 +-
 t/t7601-merge-pull-config.sh | 28 +++++++++++++++++-----------
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index dc812139f4..ad33d2472c 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt

@@ -60,6 +60,9 @@ However, a non-fast-foward case looks very different.
        origin/master in your repository
 ------------

+By default `git pull` will warn about these situations, however, most likely
+you would want to force a merge, which you can do with `git pull --no-rebase`.
+

 Then "`git pull`" will fetch and replay the changes from the remote
 `master` branch since it diverged from the local `master` (i.e., `E`)
 until its current commit (`C`) on top of `master` and record the

diff --git a/builtin/pull.c b/builtin/pull.c
index f82e214fc8..f0b1c6bfea 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c

@@ -1013,7 +1013,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)

        can_ff = get_can_ff(&orig_head, &merge_heads.oid[0]);

-       if (default_mode && opt_verbosity >= 0 && !opt_ff) {
+       if (default_mode && !can_ff && opt_verbosity >= 0 && !opt_ff) {
                advise(_("Pulling without specifying how to reconcile divergent branches is\n"
                        "discouraged; you need to specify if you want a merge, or a rebase.\n"
                        "You can squelch this message by running one of the following commands:\n"

diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh
index 6774e9d86f..6b4adab8b1 100755
--- a/t/t7601-merge-pull-config.sh
+++ b/t/t7601-merge-pull-config.sh

@@ -28,7 +28,7 @@ test_expect_success 'setup' '
 '

 test_expect_success 'pull.rebase not set' '
-       git reset --hard c0 &&
+       git reset --hard c2 &&
        git -c color.advice=always pull . c1 2>err &&
        test_decode_color <err >decoded &&
        test_i18ngrep "<YELLOW>hint: " decoded &&

@@ -36,54 +36,60 @@ test_expect_success 'pull.rebase not set' '

 '

-test_expect_success 'pull.rebase not set and pull.ff=true' '
+test_expect_success 'pull.rebase not set (fast-forward)' '
        git reset --hard c0 &&
+       git pull . c1 2>err &&
+       test_i18ngrep ! "Pulling without specifying how to reconcile" err
+'
+
+test_expect_success 'pull.rebase not set and pull.ff=true' '
+       git reset --hard c2 &&
        test_config pull.ff true &&
        git pull . c1 2>err &&
        test_i18ngrep ! "Pulling without specifying how to reconcile" err
 '

 test_expect_success 'pull.rebase not set and pull.ff=false' '
-       git reset --hard c0 &&
+       git reset --hard c2 &&
        test_config pull.ff false &&
        git pull . c1 2>err &&
        test_i18ngrep ! "Pulling without specifying how to reconcile" err
 '

 test_expect_success 'pull.rebase not set and pull.ff=only' '
-       git reset --hard c0 &&
+       git reset --hard c2 &&
        test_config pull.ff only &&
-       git pull . c1 2>err &&
+       test_must_fail git pull . c1 2>err &&