help: move git-diff and git-reset to different groups
[git.git] / t / t3512-cherry-pick-submodule.sh
blobbd78287841ee053fd56a44a268f8077a222cc266
1 #!/bin/sh
3 test_description='cherry-pick can handle submodules'
5 . ./test-lib.sh
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 "git cherry-pick"
12 test_expect_success 'unrelated submodule/file conflict is ignored' '
13 test_create_repo sub &&
15 touch sub/file &&
16 git -C sub add file &&
17 git -C sub commit -m "add a file in a submodule" &&
19 test_create_repo a_repo &&
21 cd a_repo &&
22 >a_file &&
23 git add a_file &&
24 git commit -m "add a file" &&
26 git branch test &&
27 git checkout test &&
29 mkdir sub &&
30 >sub/content &&
31 git add sub/content &&
32 git commit -m "add a regular folder with name sub" &&
34 echo "123" >a_file &&
35 git add a_file &&
36 git commit -m "modify a file" &&
38 git checkout master &&
40 git submodule add ../sub sub &&
41 git submodule update sub &&
42 git commit -m "add a submodule info folder with name sub" &&
44 git cherry-pick test
48 test_done