3 test_description='cherry-pick can handle submodules'
6 . "$TEST_DIRECTORY"/lib-submodule-update.sh
8 KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1
9 KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
10 KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
11 test_submodule_switch "git cherry-pick"
13 test_expect_success 'unrelated submodule/file conflict is ignored' '
14 test_create_repo sub &&
17 git -C sub add file &&
18 git -C sub commit -m "add a file in a submodule" &&
20 test_create_repo a_repo &&
25 git commit -m "add a file" &&
32 git add sub/content &&
33 git commit -m "add a regular folder with name sub" &&
37 git commit -m "modify a file" &&
39 git checkout master &&
41 git submodule add ../sub sub &&
42 git submodule update sub &&
43 git commit -m "add a submodule info folder with name sub" &&