t7601: add tests of interactions with multiple merge heads and config

There were already code checking that --rebase was incompatible with
a merge of multiple heads.  However, we were sometimes throwing warnings
about lack of specification of rebase vs. merge when given multiple
heads.  Since rebasing is disallowed with multiple merge heads, that
seems like a poor warning to print; we should instead just assume
merging is wanted.

Add a few tests checking multiple merge head behavior.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh
index a44e6e69f2b58b2703fb2d6a707be8dae395d9a7..21db1e9e14b6d3a098d0be02c8689f329a2dda4f 100755 (executable)
--- a/t/t7601-merge-pull-config.sh
+++ b/t/t7601-merge-pull-config.sh
@@ -325,6 +325,28 @@ test_expect_success 'pull.rebase=false and --ff, ff not possible' '
 
 # End of groupings for conflicting merge vs. rebase flags/options
 
+test_expect_failure 'Multiple heads warns about inability to fast forward' '
+       git reset --hard c1 &&
+       test_must_fail git pull . c2 c3 2>err &&
+       test_i18ngrep "Pulling without specifying how to reconcile" err
+'
+
+test_expect_failure 'Multiple can never be fast forwarded' '
+       git reset --hard c0 &&
+       test_must_fail git -c pull.ff=only pull . c1 c2 c3 2>err &&
+       test_i18ngrep ! "Pulling without specifying how to reconcile" err &&
+       # In addition to calling out "cannot fast-forward", we very much
+       # want the "multiple branches" piece to be called out to users.
+       test_i18ngrep "Cannot fast-forward to multiple branches" err
+'
+
+test_expect_success 'Cannot rebase with multiple heads' '
+       git reset --hard c0 &&
+       test_must_fail git -c pull.rebase=true pull . c1 c2 c3 2>err &&
+       test_i18ngrep ! "Pulling without specifying how to reconcile" err &&
+       test_i18ngrep "Cannot rebase onto multiple branches." err
+'
+
 test_expect_success 'merge c1 with c2' '
        git reset --hard c1 &&
        test -f c0.c &&