Merge branch 'ea/blame-use-oideq'

[thirdparty/git.git] / t / t5572-pull-submodule.sh

diff --git a/t/t5572-pull-submodule.sh b/t/t5572-pull-submodule.sh
index f916729a12b24b75184144c2eaa9abdbf1c12639..1d75e3b12ba1641d6bad4a8f76e84df9a9bf59f7 100755 (executable)
--- a/t/t5572-pull-submodule.sh
+++ b/t/t5572-pull-submodule.sh
@@ -13,34 +13,38 @@ reset_branch_to_HEAD () {
 
 git_pull () {
        reset_branch_to_HEAD "$1" &&
-       git pull
+       may_only_be_test_must_fail "$2" &&
+       $2 git pull
 }
 
 # pulls without conflicts
-test_submodule_switch "git_pull"
+test_submodule_switch_func "git_pull"
 
 git_pull_ff () {
        reset_branch_to_HEAD "$1" &&
-       git pull --ff
+       may_only_be_test_must_fail "$2" &&
+       $2 git pull --ff
 }
 
-test_submodule_switch "git_pull_ff"
+test_submodule_switch_func "git_pull_ff"
 
 git_pull_ff_only () {
        reset_branch_to_HEAD "$1" &&
-       git pull --ff-only
+       may_only_be_test_must_fail "$2" &&
+       $2 git pull --ff-only
 }
 
-test_submodule_switch "git_pull_ff_only"
+test_submodule_switch_func "git_pull_ff_only"
 
 git_pull_noff () {
        reset_branch_to_HEAD "$1" &&
-       git pull --no-ff
+       may_only_be_test_must_fail "$2" &&
+       $2 git pull --no-ff
 }
 
 KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
 KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
-test_submodule_switch "git_pull_noff"
+test_submodule_switch_func "git_pull_noff"
 
 test_expect_success 'pull --recurse-submodule setup' '
        test_create_repo child &&