]>
Commit | Line | Data |
---|---|---|
283f56a4 JL |
1 | #!/bin/sh |
2 | ||
3 | test_description='cherry-pick can handle submodules' | |
4 | ||
5 | . ./test-lib.sh | |
6 | . "$TEST_DIRECTORY"/lib-submodule-update.sh | |
7 | ||
283f56a4 JL |
8 | KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1 |
9 | KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1 | |
aa06180a | 10 | test_submodule_switch "cherry-pick" |
283f56a4 | 11 | |
c641ca67 | 12 | test_expect_success 'unrelated submodule/file conflict is ignored' ' |
89c4ee4e SB |
13 | test_create_repo sub && |
14 | ||
15 | touch sub/file && | |
16 | git -C sub add file && | |
17 | git -C sub commit -m "add a file in a submodule" && | |
18 | ||
19 | test_create_repo a_repo && | |
20 | ( | |
21 | cd a_repo && | |
22 | >a_file && | |
23 | git add a_file && | |
24 | git commit -m "add a file" && | |
25 | ||
26 | git branch test && | |
27 | git checkout test && | |
28 | ||
29 | mkdir sub && | |
30 | >sub/content && | |
31 | git add sub/content && | |
32 | git commit -m "add a regular folder with name sub" && | |
33 | ||
34 | echo "123" >a_file && | |
35 | git add a_file && | |
36 | git commit -m "modify a file" && | |
37 | ||
38 | git checkout master && | |
39 | ||
40 | git submodule add ../sub sub && | |
41 | git submodule update sub && | |
42 | git commit -m "add a submodule info folder with name sub" && | |
43 | ||
44 | git cherry-pick test | |
45 | ) | |
46 | ' | |
47 | ||
283f56a4 | 48 | test_done |