1 #!/bin/sh
3 test_description='test cherry-pick and revert with conflicts
5 -
6 + picked: rewrites foo to c
7 + base: rewrites foo to b
8 + initial: writes foo as a, unrelated as unrelated
10 '
12 . ./test-lib.sh
14 test_cmp_rev () {
15 git rev-parse --verify "$1" >expect.rev &&
16 git rev-parse --verify "$2" >actual.rev &&
17 test_cmp expect.rev actual.rev
18 }
20 pristine_detach () {
21 git checkout -f "$1^0" &&
22 git read-tree -u --reset HEAD &&
23 git clean -d -f -f -q -x
24 }
26 test_expect_success setup '
28 echo unrelated >unrelated &&
29 git add unrelated &&
30 test_commit initial foo a &&
31 test_commit base foo b &&
32 test_commit picked foo c &&
33 git config advice.detachedhead false
35 '
37 test_expect_success 'failed cherry-pick does not advance HEAD' '
38 pristine_detach initial &&
40 head=$(git rev-parse HEAD) &&
41 test_must_fail git cherry-pick picked &&
42 newhead=$(git rev-parse HEAD) &&
44 test "$head" = "$newhead"
45 '
47 test_expect_success 'advice from failed cherry-pick' "
48 pristine_detach initial &&
50 picked=\$(git rev-parse --short picked) &&
51 cat <<-EOF >expected &&
52 error: could not apply \$picked... picked
53 hint: after resolving the conflicts, mark the corrected paths
54 hint: with 'git add <paths>' or 'git rm <paths>'
55 hint: and commit the result with 'git commit'
56 EOF
57 test_must_fail git cherry-pick picked 2>actual &&
59 test_i18ncmp expected actual
60 "
62 test_expect_success 'failed cherry-pick sets CHERRY_PICK_HEAD' '
63 pristine_detach initial &&
64 test_must_fail git cherry-pick picked &&
65 test_cmp_rev picked CHERRY_PICK_HEAD
66 '
68 test_expect_success 'successful cherry-pick does not set CHERRY_PICK_HEAD' '
69 pristine_detach initial &&
70 git cherry-pick base &&
71 test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
72 '
74 test_expect_success 'cherry-pick --no-commit does not set CHERRY_PICK_HEAD' '
75 pristine_detach initial &&
76 git cherry-pick --no-commit base &&
77 test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
78 '
80 test_expect_success 'cherry-pick w/dirty tree does not set CHERRY_PICK_HEAD' '
81 pristine_detach initial &&
82 echo foo > foo &&
83 test_must_fail git cherry-pick base &&
84 test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
85 '
87 test_expect_success \
88 'cherry-pick --strategy=resolve w/dirty tree does not set CHERRY_PICK_HEAD' '
89 pristine_detach initial &&
90 echo foo > foo &&
91 test_must_fail git cherry-pick --strategy=resolve base &&
92 test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
93 '
95 test_expect_success 'GIT_CHERRY_PICK_HELP suppresses CHERRY_PICK_HEAD' '
96 pristine_detach initial &&
97 (
98 GIT_CHERRY_PICK_HELP="and then do something else" &&
99 export GIT_CHERRY_PICK_HELP &&
100 test_must_fail git cherry-pick picked
101 ) &&
102 test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
103 '
105 test_expect_success 'git reset clears CHERRY_PICK_HEAD' '
106 pristine_detach initial &&
108 test_must_fail git cherry-pick picked &&
109 git reset &&
111 test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
112 '
114 test_expect_success 'failed commit does not clear CHERRY_PICK_HEAD' '
115 pristine_detach initial &&
117 test_must_fail git cherry-pick picked &&
118 test_must_fail git commit &&
120 test_cmp_rev picked CHERRY_PICK_HEAD
121 '
123 test_expect_success 'cancelled commit does not clear CHERRY_PICK_HEAD' '
124 pristine_detach initial &&
126 test_must_fail git cherry-pick picked &&
127 echo resolved >foo &&
128 git add foo &&
129 git update-index --refresh -q &&
130 test_must_fail git diff-index --exit-code HEAD &&
131 (
132 GIT_EDITOR=false &&
133 export GIT_EDITOR &&
134 test_must_fail git commit
135 ) &&
137 test_cmp_rev picked CHERRY_PICK_HEAD
138 '
140 test_expect_success 'successful commit clears CHERRY_PICK_HEAD' '
141 pristine_detach initial &&
143 test_must_fail git cherry-pick picked &&
144 echo resolved >foo &&
145 git add foo &&
146 git commit &&
148 test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
149 '
151 test_expect_success 'failed cherry-pick produces dirty index' '
152 pristine_detach initial &&
154 test_must_fail git cherry-pick picked &&
156 test_must_fail git update-index --refresh -q &&
157 test_must_fail git diff-index --exit-code HEAD
158 '
160 test_expect_success 'failed cherry-pick registers participants in index' '
161 pristine_detach initial &&
162 {
163 git checkout base -- foo &&
164 git ls-files --stage foo &&
165 git checkout initial -- foo &&
166 git ls-files --stage foo &&
167 git checkout picked -- foo &&
168 git ls-files --stage foo
169 } > stages &&
170 sed "
171 1 s/ 0 / 1 /
172 2 s/ 0 / 2 /
173 3 s/ 0 / 3 /
174 " < stages > expected &&
175 git read-tree -u --reset HEAD &&
177 test_must_fail git cherry-pick picked &&
178 git ls-files --stage --unmerged > actual &&
180 test_cmp expected actual
181 '
183 test_expect_success 'failed cherry-pick describes conflict in work tree' '
184 pristine_detach initial &&
185 cat <<-EOF > expected &&
186 <<<<<<< HEAD
187 a
188 =======
189 c
190 >>>>>>> objid picked
191 EOF
193 test_must_fail git cherry-pick picked &&
195 sed "s/[a-f0-9]*\.\.\./objid/" foo > actual &&
196 test_cmp expected actual
197 '
199 test_expect_success 'diff3 -m style' '
200 pristine_detach initial &&
201 git config merge.conflictstyle diff3 &&
202 cat <<-EOF > expected &&
203 <<<<<<< HEAD
204 a
205 ||||||| parent of objid picked
206 b
207 =======
208 c
209 >>>>>>> objid picked
210 EOF
212 test_must_fail git cherry-pick picked &&
214 sed "s/[a-f0-9]*\.\.\./objid/" foo > actual &&
215 test_cmp expected actual
216 '
218 test_expect_success 'revert also handles conflicts sanely' '
219 git config --unset merge.conflictstyle &&
220 pristine_detach initial &&
221 cat <<-EOF > expected &&
222 <<<<<<< HEAD
223 a
224 =======
225 b
226 >>>>>>> parent of objid picked
227 EOF
228 {
229 git checkout picked -- foo &&
230 git ls-files --stage foo &&
231 git checkout initial -- foo &&
232 git ls-files --stage foo &&
233 git checkout base -- foo &&
234 git ls-files --stage foo
235 } > stages &&
236 sed "
237 1 s/ 0 / 1 /
238 2 s/ 0 / 2 /
239 3 s/ 0 / 3 /
240 " < stages > expected-stages &&
241 git read-tree -u --reset HEAD &&
243 head=$(git rev-parse HEAD) &&
244 test_must_fail git revert picked &&
245 newhead=$(git rev-parse HEAD) &&
246 git ls-files --stage --unmerged > actual-stages &&
248 test "$head" = "$newhead" &&
249 test_must_fail git update-index --refresh -q &&
250 test_must_fail git diff-index --exit-code HEAD &&
251 test_cmp expected-stages actual-stages &&
252 sed "s/[a-f0-9]*\.\.\./objid/" foo > actual &&
253 test_cmp expected actual
254 '
256 test_expect_success 'revert conflict, diff3 -m style' '
257 pristine_detach initial &&
258 git config merge.conflictstyle diff3 &&
259 cat <<-EOF > expected &&
260 <<<<<<< HEAD
261 a
262 ||||||| objid picked
263 c
264 =======
265 b
266 >>>>>>> parent of objid picked
267 EOF
269 test_must_fail git revert picked &&
271 sed "s/[a-f0-9]*\.\.\./objid/" foo > actual &&
272 test_cmp expected actual
273 '
275 test_done