3 test_description='pull can handle submodules'
6 . "$TEST_DIRECTORY"/lib-submodule-update.sh
8 reset_branch_to_HEAD () {
10 git checkout -b "$1" HEAD &&
11 git branch --set-upstream-to="origin/$1" "$1"
15 reset_branch_to_HEAD "$1" &&
19 # pulls without conflicts
20 test_submodule_switch "git_pull"
23 reset_branch_to_HEAD "$1" &&
27 test_submodule_switch "git_pull_ff"
30 reset_branch_to_HEAD "$1" &&
34 test_submodule_switch "git_pull_ff_only"
37 reset_branch_to_HEAD "$1" &&
41 KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
42 KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
43 test_submodule_switch "git_pull_noff"