t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure
Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stefan Beller committed
Nov 10, 2017 at 16:04 UTC
89c4ee4e74269635e69c84800ece0f8b754636f6
1 file changed
+36
t/t3512-cherry-pick-submodule.sh
+36
@@ -10,4 +10,40 @@ 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"
12
13
+test_expect_failure 'unrelated submodule/file conflict is ignored' '
14
+ test_create_repo sub &&
15
+
16
+ touch sub/file &&
17
+ git -C sub add file &&
18
+ git -C sub commit -m "add a file in a submodule" &&
19
+
20
+ test_create_repo a_repo &&
21
+ (
22
+ cd a_repo &&
23
+ >a_file &&
24
+ git add a_file &&
25
+ git commit -m "add a file" &&
26
+
27
+ git branch test &&
28
+ git checkout test &&
29
+
30
+ mkdir sub &&
31
+ >sub/content &&
32
+ git add sub/content &&
33
+ git commit -m "add a regular folder with name sub" &&
34
+
35
+ echo "123" >a_file &&
36
+ git add a_file &&
37
+ git commit -m "modify a file" &&
38
+
39
+ git checkout master &&
40
+
41
+ git submodule add ../sub sub &&
42
+ git submodule update sub &&
43
+ git commit -m "add a submodule info folder with name sub" &&
44
+
45
+ git cherry-pick test
46
+ )
47
+'
48
+
49
test_done