3 test_description
='merge-recursive backend test'
7 test_expect_success
'setup 1' '
10 o0=$(git hash-object a) &&
18 git commit -m initial &&
19 c0=$(git rev-parse --verify HEAD) &&
28 o1=$(git hash-object a) &&
33 git commit -m "master modifies a and d/e" &&
34 c1=$(git rev-parse --verify HEAD) &&
35 ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
37 echo "100644 blob $o1 a"
38 echo "100644 blob $o0 b"
39 echo "100644 blob $o0 c"
40 echo "100644 blob $o1 d/e"
44 echo "100644 $o1 0 d/e"
46 test_cmp expected actual
49 test_expect_success
'setup 2' '
53 ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
55 echo "100644 blob $o0 a"
56 echo "100644 blob $o0 b"
57 echo "100644 blob $o0 c"
58 echo "100644 blob $o0 d/e"
62 echo "100644 $o0 0 d/e"
64 test_cmp expected actual &&
67 o2=$(git hash-object a) &&
72 git commit -m "side modifies a" &&
73 c2=$(git rev-parse --verify HEAD) &&
74 ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
76 echo "100644 blob $o2 a"
77 echo "100644 blob $o0 b"
78 echo "100644 blob $o0 c"
79 echo "100644 blob $o0 d/e"
83 echo "100644 $o0 0 d/e"
85 test_cmp expected actual
88 test_expect_success
'setup 3' '
92 ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
94 echo "100644 blob $o0 a"
95 echo "100644 blob $o0 b"
96 echo "100644 blob $o0 c"
97 echo "100644 blob $o0 d/e"
100 echo "100644 $o0 0 c"
101 echo "100644 $o0 0 d/e"
103 test_cmp expected actual &&
105 rm -f b && mkdir b && echo df-1 >b/c && git add b/c &&
106 o3=$(git hash-object b/c) &&
109 git commit -m "df-1 makes b/c" &&
110 c3=$(git rev-parse --verify HEAD) &&
111 ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
113 echo "100644 blob $o0 a"
114 echo "100644 blob $o3 b/c"
115 echo "100644 blob $o0 c"
116 echo "100644 blob $o0 d/e"
117 echo "100644 $o0 0 a"
118 echo "100644 $o3 0 b/c"
119 echo "100644 $o0 0 c"
120 echo "100644 $o0 0 d/e"
122 test_cmp expected actual
125 test_expect_success
'setup 4' '
129 ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
131 echo "100644 blob $o0 a"
132 echo "100644 blob $o0 b"
133 echo "100644 blob $o0 c"
134 echo "100644 blob $o0 d/e"
135 echo "100644 $o0 0 a"
136 echo "100644 $o0 0 b"
137 echo "100644 $o0 0 c"
138 echo "100644 $o0 0 d/e"
140 test_cmp expected actual &&
142 rm -f a && mkdir a && echo df-2 >a/c && git add a/c &&
143 o4=$(git hash-object a/c) &&
146 git commit -m "df-2 makes a/c" &&
147 c4=$(git rev-parse --verify HEAD) &&
148 ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
150 echo "100644 blob $o4 a/c"
151 echo "100644 blob $o0 b"
152 echo "100644 blob $o0 c"
153 echo "100644 blob $o0 d/e"
154 echo "100644 $o4 0 a/c"
155 echo "100644 $o0 0 b"
156 echo "100644 $o0 0 c"
157 echo "100644 $o0 0 d/e"
159 test_cmp expected actual
162 test_expect_success
'setup 5' '
165 git checkout remove &&
166 ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
168 echo "100644 blob $o0 a"
169 echo "100644 blob $o0 b"
170 echo "100644 blob $o0 c"
171 echo "100644 blob $o0 d/e"
172 echo "100644 $o0 0 a"
173 echo "100644 $o0 0 b"
174 echo "100644 $o0 0 c"
175 echo "100644 $o0 0 d/e"
177 test_cmp expected actual &&
180 echo remove-conflict >a &&
184 o5=$(git hash-object a) &&
187 git commit -m "remove removes b and modifies a" &&
188 c5=$(git rev-parse --verify HEAD) &&
189 ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
191 echo "100644 blob $o5 a"
192 echo "100644 blob $o0 c"
193 echo "100644 blob $o0 d/e"
194 echo "100644 $o5 0 a"
195 echo "100644 $o0 0 c"
196 echo "100644 $o0 0 d/e"
198 test_cmp expected actual
202 test_expect_success
'setup 6' '
206 ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
208 echo "100644 blob $o0 a"
209 echo "100644 blob $o0 b"
210 echo "100644 blob $o0 c"
211 echo "100644 blob $o0 d/e"
212 echo "100644 $o0 0 a"
213 echo "100644 $o0 0 b"
214 echo "100644 $o0 0 c"
215 echo "100644 $o0 0 d/e"
217 test_cmp expected actual &&
219 rm -fr d && echo df-3 >d && git add d &&
220 o6=$(git hash-object d) &&
223 git commit -m "df-3 makes d" &&
224 c6=$(git rev-parse --verify HEAD) &&
225 ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
227 echo "100644 blob $o0 a"
228 echo "100644 blob $o0 b"
229 echo "100644 blob $o0 c"
230 echo "100644 blob $o6 d"
231 echo "100644 $o0 0 a"
232 echo "100644 $o0 0 b"
233 echo "100644 $o0 0 c"
234 echo "100644 $o6 0 d"
236 test_cmp expected actual
239 test_expect_success
'merge-recursive simple' '
242 git checkout -f "$c2" &&
244 git-merge-recursive "$c0" -- "$c2" "$c1"
251 echo >&2 "why status $status!!!"
257 test_expect_success
'merge-recursive result' '
259 git ls-files -s >actual &&
261 echo "100644 $o0 1 a"
262 echo "100644 $o2 2 a"
263 echo "100644 $o1 3 a"
264 echo "100644 $o0 0 b"
265 echo "100644 $o0 0 c"
266 echo "100644 $o1 0 d/e"
268 test_cmp expected actual
272 test_expect_success
'merge-recursive remove conflict' '
275 git checkout -f "$c1" &&
277 git-merge-recursive "$c0" -- "$c1" "$c5"
284 echo >&2 "why status $status!!!"
290 test_expect_success
'merge-recursive remove conflict' '
292 git ls-files -s >actual &&
294 echo "100644 $o0 1 a"
295 echo "100644 $o1 2 a"
296 echo "100644 $o5 3 a"
297 echo "100644 $o0 0 c"
298 echo "100644 $o1 0 d/e"
300 test_cmp expected actual
304 test_expect_success
'merge-recursive d/f simple' '
307 git checkout -f "$c1" &&
309 git-merge-recursive "$c0" -- "$c1" "$c3"
312 test_expect_success
'merge-recursive result' '
314 git ls-files -s >actual &&
316 echo "100644 $o1 0 a"
317 echo "100644 $o3 0 b/c"
318 echo "100644 $o0 0 c"
319 echo "100644 $o1 0 d/e"
321 test_cmp expected actual
325 test_expect_success
'merge-recursive d/f conflict' '
329 git checkout -f "$c1" &&
331 git-merge-recursive "$c0" -- "$c1" "$c4"
338 echo >&2 "why status $status!!!"
344 test_expect_success
'merge-recursive d/f conflict result' '
346 git ls-files -s >actual &&
348 echo "100644 $o0 1 a"
349 echo "100644 $o1 2 a"
350 echo "100644 $o4 0 a/c"
351 echo "100644 $o0 0 b"
352 echo "100644 $o0 0 c"
353 echo "100644 $o1 0 d/e"
355 test_cmp expected actual
359 test_expect_success
'merge-recursive d/f conflict the other way' '
363 git checkout -f "$c4" &&
365 git-merge-recursive "$c0" -- "$c4" "$c1"
372 echo >&2 "why status $status!!!"
378 test_expect_success
'merge-recursive d/f conflict result the other way' '
380 git ls-files -s >actual &&
382 echo "100644 $o0 1 a"
383 echo "100644 $o1 3 a"
384 echo "100644 $o4 0 a/c"
385 echo "100644 $o0 0 b"
386 echo "100644 $o0 0 c"
387 echo "100644 $o1 0 d/e"
389 test_cmp expected actual
393 test_expect_success
'merge-recursive d/f conflict' '
397 git checkout -f "$c1" &&
399 git-merge-recursive "$c0" -- "$c1" "$c6"
406 echo >&2 "why status $status!!!"
412 test_expect_success
'merge-recursive d/f conflict result' '
414 git ls-files -s >actual &&
416 echo "100644 $o1 0 a"
417 echo "100644 $o0 0 b"
418 echo "100644 $o0 0 c"
419 echo "100644 $o6 3 d"
420 echo "100644 $o0 1 d/e"
421 echo "100644 $o1 2 d/e"
423 test_cmp expected actual
427 test_expect_success
'merge-recursive d/f conflict' '
431 git checkout -f "$c6" &&
433 git-merge-recursive "$c0" -- "$c6" "$c1"
440 echo >&2 "why status $status!!!"
446 test_expect_success
'merge-recursive d/f conflict result' '
448 git ls-files -s >actual &&
450 echo "100644 $o1 0 a"
451 echo "100644 $o0 0 b"
452 echo "100644 $o0 0 c"
453 echo "100644 $o6 2 d"
454 echo "100644 $o0 1 d/e"
455 echo "100644 $o1 3 d/e"
457 test_cmp expected actual
461 test_expect_success
'reset and 3-way merge' '
463 git reset --hard "$c2" &&
464 git read-tree -m "$c0" "$c2" "$c1"
468 test_expect_success
'reset and bind merge' '
470 git reset --hard master &&
471 git read-tree --prefix=M/ master &&
472 git ls-files -s >actual &&
474 echo "100644 $o1 0 M/a"
475 echo "100644 $o0 0 M/b"
476 echo "100644 $o0 0 M/c"
477 echo "100644 $o1 0 M/d/e"
478 echo "100644 $o1 0 a"
479 echo "100644 $o0 0 b"
480 echo "100644 $o0 0 c"
481 echo "100644 $o1 0 d/e"
483 test_cmp expected actual &&
485 git read-tree --prefix=a1/ master &&
486 git ls-files -s >actual &&
488 echo "100644 $o1 0 M/a"
489 echo "100644 $o0 0 M/b"
490 echo "100644 $o0 0 M/c"
491 echo "100644 $o1 0 M/d/e"
492 echo "100644 $o1 0 a"
493 echo "100644 $o1 0 a1/a"
494 echo "100644 $o0 0 a1/b"
495 echo "100644 $o0 0 a1/c"
496 echo "100644 $o1 0 a1/d/e"
497 echo "100644 $o0 0 b"
498 echo "100644 $o0 0 c"
499 echo "100644 $o1 0 d/e"
501 test_cmp expected actual
503 git read-tree --prefix=z/ master &&
504 git ls-files -s >actual &&
506 echo "100644 $o1 0 M/a"
507 echo "100644 $o0 0 M/b"
508 echo "100644 $o0 0 M/c"
509 echo "100644 $o1 0 M/d/e"
510 echo "100644 $o1 0 a"
511 echo "100644 $o1 0 a1/a"
512 echo "100644 $o0 0 a1/b"
513 echo "100644 $o0 0 a1/c"
514 echo "100644 $o1 0 a1/d/e"
515 echo "100644 $o0 0 b"
516 echo "100644 $o0 0 c"
517 echo "100644 $o1 0 d/e"
518 echo "100644 $o1 0 z/a"
519 echo "100644 $o0 0 z/b"
520 echo "100644 $o0 0 z/c"
521 echo "100644 $o1 0 z/d/e"
523 test_cmp expected actual