cherry-pick/revert -m: add tests
[git/git.git] / t / t3502-cherry-pick-merge.sh
1 #!/bin/sh
2
3 test_description='cherry picking and reverting a merge
4
5 b---c
6 / /
7 initial---a
8
9 '
10
11 . ./test-lib.sh
12
13 test_expect_success setup '
14
15 >A &&
16 >B &&
17 git add A B &&
18 git commit -m "Initial" &&
19 git tag initial &&
20 git branch side &&
21 echo new line >A &&
22 git commit -m "add line to A" A &&
23 git tag a &&
24 git checkout side &&
25 echo new line >B &&
26 git commit -m "add line to B" B &&
27 git tag b &&
28 git checkout master &&
29 git merge side &&
30 git tag c
31
32 '
33
34 test_expect_success 'cherry-pick a non-merge with -m should fail' '
35
36 git reset --hard &&
37 git checkout a^0 &&
38 ! git cherry-pick -m 1 b &&
39 git diff --exit-code a
40
41 '
42
43 test_expect_success 'cherry pick a merge without -m should fail' '
44
45 git reset --hard &&
46 git checkout a^0 &&
47 ! git cherry-pick c &&
48 git diff --exit-code a
49
50 '
51
52 test_expect_success 'cherry pick a merge (1)' '
53
54 git reset --hard &&
55 git checkout a^0 &&
56 git cherry-pick -m 1 c &&
57 git diff --exit-code c
58
59 '
60
61 test_expect_success 'cherry pick a merge (2)' '
62
63 git reset --hard &&
64 git checkout b^0 &&
65 git cherry-pick -m 2 c &&
66 git diff --exit-code c
67
68 '
69
70 test_expect_success 'cherry pick a merge relative to nonexistent parent should fail' '
71
72 git reset --hard &&
73 git checkout b^0 &&
74 ! git cherry-pick -m 3 c
75
76 '
77
78 test_expect_success 'revert a non-merge with -m should fail' '
79
80 git reset --hard &&
81 git checkout c^0 &&
82 ! git revert -m 1 b &&
83 git diff --exit-code c
84
85 '
86
87 test_expect_success 'revert a merge without -m should fail' '
88
89 git reset --hard &&
90 git checkout c^0 &&
91 ! git revert c &&
92 git diff --exit-code c
93
94 '
95
96 test_expect_success 'revert a merge (1)' '
97
98 git reset --hard &&
99 git checkout c^0 &&
100 git revert -m 1 c &&
101 git diff --exit-code a
102
103 '
104
105 test_expect_success 'revert a merge (2)' '
106
107 git reset --hard &&
108 git checkout c^0 &&
109 git revert -m 2 c &&
110 git diff --exit-code b
111
112 '
113
114 test_expect_success 'revert a merge relative to nonexistent parent should fail' '
115
116 git reset --hard &&
117 git checkout c^0 &&
118 ! git revert -m 3 c &&
119 git diff --exit-code c
120
121 '
122
123 test_done