t7601 (merge-pull-config): add missing &&

Also prefix several relevant git merge commands with 'test_must_fail' to
keep the tests passing.

Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
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 7ba94ea99bc0785da5b398e494d23469ba44992d..b44b29395049308b30e61b00a55e2eb39f4355a1 100755 (executable)
--- a/t/t7601-merge-pull-config.sh
+++ b/t/t7601-merge-pull-config.sh
@@ -114,13 +114,13 @@ test_expect_success 'setup conflicted merge' '
 test_expect_success 'merge picks up the best result' '
        git config --unset-all pull.twohead &&
        git reset --hard c5 &&
 test_expect_success 'merge picks up the best result' '
        git config --unset-all pull.twohead &&
        git reset --hard c5 &&

-       git merge -s resolve c6
+       test_must_fail git merge -s resolve c6 &&

        resolve_count=$(conflict_count) &&
        git reset --hard c5 &&
        resolve_count=$(conflict_count) &&
        git reset --hard c5 &&

-       git merge -s recursive c6
+       test_must_fail git merge -s recursive c6 &&

        recursive_count=$(conflict_count) &&
        git reset --hard c5 &&
        recursive_count=$(conflict_count) &&
        git reset --hard c5 &&

-       git merge -s recursive -s resolve c6
+       test_must_fail git merge -s recursive -s resolve c6 &&

        auto_count=$(conflict_count) &&
        test $auto_count = $recursive_count &&
        test $auto_count != $resolve_count
        auto_count=$(conflict_count) &&
        test $auto_count = $recursive_count &&
        test $auto_count != $resolve_count


@@ -129,13 +129,13 @@ test_expect_success 'merge picks up the best result' '
 test_expect_success 'merge picks up the best result (from config)' '
        git config pull.twohead "recursive resolve" &&
        git reset --hard c5 &&
 test_expect_success 'merge picks up the best result (from config)' '
        git config pull.twohead "recursive resolve" &&
        git reset --hard c5 &&

-       git merge -s resolve c6
+       test_must_fail git merge -s resolve c6 &&

        resolve_count=$(conflict_count) &&
        git reset --hard c5 &&
        resolve_count=$(conflict_count) &&
        git reset --hard c5 &&

-       git merge -s recursive c6
+       test_must_fail git merge -s recursive c6 &&

        recursive_count=$(conflict_count) &&
        git reset --hard c5 &&
        recursive_count=$(conflict_count) &&
        git reset --hard c5 &&

-       git merge c6
+       test_must_fail git merge c6 &&

        auto_count=$(conflict_count) &&
        test $auto_count = $recursive_count &&
        test $auto_count != $resolve_count
        auto_count=$(conflict_count) &&
        test $auto_count = $recursive_count &&
        test $auto_count != $resolve_count