3 test_description
='cherry-pick can handle submodules'
6 .
"$TEST_DIRECTORY"/lib-submodule-update.sh
8 KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR
=1
9 KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES
=1
10 test_submodule_switch
"cherry-pick"
12 test_expect_success
'unrelated submodule/file conflict is ignored' '
13 test_config_global protocol.file.allow always &&
15 test_create_repo sub &&
18 git -C sub add file &&
19 git -C sub commit -m "add a file in a submodule" &&
21 test_create_repo a_repo &&
26 git commit -m "add a file" &&
33 git add sub/content &&
34 git commit -m "add a regular folder with name sub" &&
38 git commit -m "modify a file" &&
40 git checkout master &&
42 git submodule add ../sub sub &&
43 git submodule update sub &&
44 git commit -m "add a submodule info folder with name sub" &&