merge-recursive: symlink's descendants not in way
[git/git.git] / t / t3030-merge-recursive.sh
CommitLineData
885b9810
JH
1#!/bin/sh
2
3test_description='merge-recursive backend test'
4
5. ./test-lib.sh
6
7test_expect_success 'setup 1' '
8
9 echo hello >a &&
10 o0=$(git hash-object a) &&
11 cp a b &&
744747ef 12 cp a c &&
885b9810
JH
13 mkdir d &&
14 cp a d/e &&
15
16 test_tick &&
744747ef 17 git add a b c d/e &&
885b9810
JH
18 git commit -m initial &&
19 c0=$(git rev-parse --verify HEAD) &&
20 git branch side &&
21 git branch df-1 &&
22 git branch df-2 &&
23 git branch df-3 &&
24 git branch remove &&
7d82b06d 25 git branch submod &&
d5af5105
SK
26 git branch copy &&
27 git branch rename &&
bba56042 28 git branch rename-ln &&
885b9810
JH
29
30 echo hello >>a &&
31 cp a d/e &&
32 o1=$(git hash-object a) &&
33
34 git add a d/e &&
35
36 test_tick &&
37 git commit -m "master modifies a and d/e" &&
38 c1=$(git rev-parse --verify HEAD) &&
b6c32f63 39 ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
885b9810 40 (
b6c32f63
ES
41 echo "100644 blob $o1 a" &&
42 echo "100644 blob $o0 b" &&
43 echo "100644 blob $o0 c" &&
44 echo "100644 blob $o1 d/e" &&
45 echo "100644 $o1 0 a" &&
46 echo "100644 $o0 0 b" &&
47 echo "100644 $o0 0 c" &&
885b9810
JH
48 echo "100644 $o1 0 d/e"
49 ) >expected &&
3af82863 50 test_cmp expected actual
885b9810
JH
51'
52
53test_expect_success 'setup 2' '
54
744747ef 55 rm -rf [abcd] &&
885b9810 56 git checkout side &&
b6c32f63 57 ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
885b9810 58 (
b6c32f63
ES
59 echo "100644 blob $o0 a" &&
60 echo "100644 blob $o0 b" &&
61 echo "100644 blob $o0 c" &&
62 echo "100644 blob $o0 d/e" &&
63 echo "100644 $o0 0 a" &&
64 echo "100644 $o0 0 b" &&
65 echo "100644 $o0 0 c" &&
885b9810
JH
66 echo "100644 $o0 0 d/e"
67 ) >expected &&
3af82863 68 test_cmp expected actual &&
885b9810
JH
69
70 echo goodbye >>a &&
71 o2=$(git hash-object a) &&
72
73 git add a &&
74
75 test_tick &&
76 git commit -m "side modifies a" &&
77 c2=$(git rev-parse --verify HEAD) &&
b6c32f63 78 ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
885b9810 79 (
b6c32f63
ES
80 echo "100644 blob $o2 a" &&
81 echo "100644 blob $o0 b" &&
82 echo "100644 blob $o0 c" &&
83 echo "100644 blob $o0 d/e" &&
84 echo "100644 $o2 0 a" &&
85 echo "100644 $o0 0 b" &&
86 echo "100644 $o0 0 c" &&
885b9810
JH
87 echo "100644 $o0 0 d/e"
88 ) >expected &&
3af82863 89 test_cmp expected actual
885b9810
JH
90'
91
92test_expect_success 'setup 3' '
93
744747ef 94 rm -rf [abcd] &&
885b9810 95 git checkout df-1 &&
b6c32f63 96 ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
885b9810 97 (
b6c32f63
ES
98 echo "100644 blob $o0 a" &&
99 echo "100644 blob $o0 b" &&
100 echo "100644 blob $o0 c" &&
101 echo "100644 blob $o0 d/e" &&
102 echo "100644 $o0 0 a" &&
103 echo "100644 $o0 0 b" &&
104 echo "100644 $o0 0 c" &&
885b9810
JH
105 echo "100644 $o0 0 d/e"
106 ) >expected &&
3af82863 107 test_cmp expected actual &&
885b9810
JH
108
109 rm -f b && mkdir b && echo df-1 >b/c && git add b/c &&
110 o3=$(git hash-object b/c) &&
111
112 test_tick &&
113 git commit -m "df-1 makes b/c" &&
114 c3=$(git rev-parse --verify HEAD) &&
b6c32f63 115 ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
885b9810 116 (
b6c32f63
ES
117 echo "100644 blob $o0 a" &&
118 echo "100644 blob $o3 b/c" &&
119 echo "100644 blob $o0 c" &&
120 echo "100644 blob $o0 d/e" &&
121 echo "100644 $o0 0 a" &&
122 echo "100644 $o3 0 b/c" &&
123 echo "100644 $o0 0 c" &&
885b9810
JH
124 echo "100644 $o0 0 d/e"
125 ) >expected &&
3af82863 126 test_cmp expected actual
885b9810
JH
127'
128
129test_expect_success 'setup 4' '
130
744747ef 131 rm -rf [abcd] &&
885b9810 132 git checkout df-2 &&
b6c32f63 133 ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
885b9810 134 (
b6c32f63
ES
135 echo "100644 blob $o0 a" &&
136 echo "100644 blob $o0 b" &&
137 echo "100644 blob $o0 c" &&
138 echo "100644 blob $o0 d/e" &&
139 echo "100644 $o0 0 a" &&
140 echo "100644 $o0 0 b" &&
141 echo "100644 $o0 0 c" &&
885b9810
JH
142 echo "100644 $o0 0 d/e"
143 ) >expected &&
3af82863 144 test_cmp expected actual &&
885b9810
JH
145
146 rm -f a && mkdir a && echo df-2 >a/c && git add a/c &&
147 o4=$(git hash-object a/c) &&
148
149 test_tick &&
150 git commit -m "df-2 makes a/c" &&
151 c4=$(git rev-parse --verify HEAD) &&
b6c32f63 152 ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
885b9810 153 (
b6c32f63
ES
154 echo "100644 blob $o4 a/c" &&
155 echo "100644 blob $o0 b" &&
156 echo "100644 blob $o0 c" &&
157 echo "100644 blob $o0 d/e" &&
158 echo "100644 $o4 0 a/c" &&
159 echo "100644 $o0 0 b" &&
160 echo "100644 $o0 0 c" &&
885b9810
JH
161 echo "100644 $o0 0 d/e"
162 ) >expected &&
3af82863 163 test_cmp expected actual
885b9810
JH
164'
165
166test_expect_success 'setup 5' '
167
744747ef 168 rm -rf [abcd] &&
885b9810 169 git checkout remove &&
b6c32f63 170 ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
885b9810 171 (
b6c32f63
ES
172 echo "100644 blob $o0 a" &&
173 echo "100644 blob $o0 b" &&
174 echo "100644 blob $o0 c" &&
175 echo "100644 blob $o0 d/e" &&
176 echo "100644 $o0 0 a" &&
177 echo "100644 $o0 0 b" &&
178 echo "100644 $o0 0 c" &&
885b9810
JH
179 echo "100644 $o0 0 d/e"
180 ) >expected &&
3af82863 181 test_cmp expected actual &&
885b9810
JH
182
183 rm -f b &&
184 echo remove-conflict >a &&
185
186 git add a &&
187 git rm b &&
188 o5=$(git hash-object a) &&
189
190 test_tick &&
191 git commit -m "remove removes b and modifies a" &&
192 c5=$(git rev-parse --verify HEAD) &&
b6c32f63 193 ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
885b9810 194 (
b6c32f63
ES
195 echo "100644 blob $o5 a" &&
196 echo "100644 blob $o0 c" &&
197 echo "100644 blob $o0 d/e" &&
198 echo "100644 $o5 0 a" &&
199 echo "100644 $o0 0 c" &&
885b9810
JH
200 echo "100644 $o0 0 d/e"
201 ) >expected &&
3af82863 202 test_cmp expected actual
885b9810
JH
203
204'
205
206test_expect_success 'setup 6' '
207
744747ef 208 rm -rf [abcd] &&
885b9810 209 git checkout df-3 &&
b6c32f63 210 ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
885b9810 211 (
b6c32f63
ES
212 echo "100644 blob $o0 a" &&
213 echo "100644 blob $o0 b" &&
214 echo "100644 blob $o0 c" &&
215 echo "100644 blob $o0 d/e" &&
216 echo "100644 $o0 0 a" &&
217 echo "100644 $o0 0 b" &&
218 echo "100644 $o0 0 c" &&
885b9810
JH
219 echo "100644 $o0 0 d/e"
220 ) >expected &&
3af82863 221 test_cmp expected actual &&
885b9810
JH
222
223 rm -fr d && echo df-3 >d && git add d &&
224 o6=$(git hash-object d) &&
225
226 test_tick &&
227 git commit -m "df-3 makes d" &&
228 c6=$(git rev-parse --verify HEAD) &&
b6c32f63 229 ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
885b9810 230 (
b6c32f63
ES
231 echo "100644 blob $o0 a" &&
232 echo "100644 blob $o0 b" &&
233 echo "100644 blob $o0 c" &&
234 echo "100644 blob $o6 d" &&
235 echo "100644 $o0 0 a" &&
236 echo "100644 $o0 0 b" &&
237 echo "100644 $o0 0 c" &&
885b9810
JH
238 echo "100644 $o6 0 d"
239 ) >expected &&
3af82863 240 test_cmp expected actual
885b9810
JH
241'
242
7d82b06d
JS
243test_expect_success 'setup 7' '
244
245 git checkout submod &&
246 git rm d/e &&
247 test_tick &&
248 git commit -m "remove d/e" &&
249 git update-index --add --cacheinfo 160000 $c1 d &&
250 test_tick &&
251 git commit -m "make d/ a submodule"
252'
253
d5af5105
SK
254test_expect_success 'setup 8' '
255 git checkout rename &&
256 git mv a e &&
257 git add e &&
258 test_tick &&
8a1c0d32 259 git commit -m "rename a->e" &&
29d9af58 260 c7=$(git rev-parse --verify HEAD) &&
bba56042
JS
261 git checkout rename-ln &&
262 git mv a e &&
263 test_ln_s_add e a &&
264 test_tick &&
265 git commit -m "rename a->e, symlink a->e" &&
85aea1e7 266 oln=$(printf e | git hash-object --stdin)
d5af5105
SK
267'
268
269test_expect_success 'setup 9' '
270 git checkout copy &&
271 cp a e &&
272 git add e &&
273 test_tick &&
274 git commit -m "copy a->e"
275'
276
885b9810
JH
277test_expect_success 'merge-recursive simple' '
278
744747ef 279 rm -fr [abcd] &&
885b9810
JH
280 git checkout -f "$c2" &&
281
67b6afe1 282 test_expect_code 1 git merge-recursive "$c0" -- "$c2" "$c1"
885b9810
JH
283'
284
285test_expect_success 'merge-recursive result' '
286
287 git ls-files -s >actual &&
288 (
b6c32f63
ES
289 echo "100644 $o0 1 a" &&
290 echo "100644 $o2 2 a" &&
291 echo "100644 $o1 3 a" &&
292 echo "100644 $o0 0 b" &&
293 echo "100644 $o0 0 c" &&
885b9810
JH
294 echo "100644 $o1 0 d/e"
295 ) >expected &&
3af82863 296 test_cmp expected actual
885b9810
JH
297
298'
299
f2c8c800 300test_expect_success 'fail if the index has unresolved entries' '
446247db
JH
301
302 rm -fr [abcd] &&
303 git checkout -f "$c1" &&
304
305 test_must_fail git merge "$c5" &&
306 test_must_fail git merge "$c5" 2> out &&
f2c8c800 307 test_i18ngrep "not possible because you have unmerged files" out &&
d38a30df
MM
308 git add -u &&
309 test_must_fail git merge "$c5" 2> out &&
f2c8c800 310 test_i18ngrep "You have not concluded your merge" out &&
c8c562a2
CB
311 rm -f .git/MERGE_HEAD &&
312 test_must_fail git merge "$c5" 2> out &&
f2c8c800 313 test_i18ngrep "Your local changes to the following files would be overwritten by merge:" out
446247db
JH
314'
315
885b9810
JH
316test_expect_success 'merge-recursive remove conflict' '
317
744747ef 318 rm -fr [abcd] &&
885b9810
JH
319 git checkout -f "$c1" &&
320
67b6afe1 321 test_expect_code 1 git merge-recursive "$c0" -- "$c1" "$c5"
885b9810
JH
322'
323
324test_expect_success 'merge-recursive remove conflict' '
325
326 git ls-files -s >actual &&
327 (
b6c32f63
ES
328 echo "100644 $o0 1 a" &&
329 echo "100644 $o1 2 a" &&
330 echo "100644 $o5 3 a" &&
331 echo "100644 $o0 0 c" &&
885b9810
JH
332 echo "100644 $o1 0 d/e"
333 ) >expected &&
3af82863 334 test_cmp expected actual
885b9810
JH
335
336'
337
338test_expect_success 'merge-recursive d/f simple' '
744747ef 339 rm -fr [abcd] &&
885b9810
JH
340 git reset --hard &&
341 git checkout -f "$c1" &&
342
0cb0e143 343 git merge-recursive "$c0" -- "$c1" "$c3"
885b9810
JH
344'
345
346test_expect_success 'merge-recursive result' '
347
348 git ls-files -s >actual &&
349 (
b6c32f63
ES
350 echo "100644 $o1 0 a" &&
351 echo "100644 $o3 0 b/c" &&
352 echo "100644 $o0 0 c" &&
885b9810
JH
353 echo "100644 $o1 0 d/e"
354 ) >expected &&
3af82863 355 test_cmp expected actual
885b9810
JH
356
357'
358
359test_expect_success 'merge-recursive d/f conflict' '
360
744747ef 361 rm -fr [abcd] &&
885b9810
JH
362 git reset --hard &&
363 git checkout -f "$c1" &&
364
67b6afe1 365 test_expect_code 1 git merge-recursive "$c0" -- "$c1" "$c4"
885b9810
JH
366'
367
368test_expect_success 'merge-recursive d/f conflict result' '
369
370 git ls-files -s >actual &&
371 (
b6c32f63
ES
372 echo "100644 $o0 1 a" &&
373 echo "100644 $o1 2 a" &&
374 echo "100644 $o4 0 a/c" &&
375 echo "100644 $o0 0 b" &&
376 echo "100644 $o0 0 c" &&
885b9810
JH
377 echo "100644 $o1 0 d/e"
378 ) >expected &&
3af82863 379 test_cmp expected actual
885b9810
JH
380
381'
382
383test_expect_success 'merge-recursive d/f conflict the other way' '
384
744747ef 385 rm -fr [abcd] &&
885b9810
JH
386 git reset --hard &&
387 git checkout -f "$c4" &&
388
67b6afe1 389 test_expect_code 1 git merge-recursive "$c0" -- "$c4" "$c1"
885b9810
JH
390'
391
392test_expect_success 'merge-recursive d/f conflict result the other way' '
393
394 git ls-files -s >actual &&
395 (
b6c32f63
ES
396 echo "100644 $o0 1 a" &&
397 echo "100644 $o1 3 a" &&
398 echo "100644 $o4 0 a/c" &&
399 echo "100644 $o0 0 b" &&
400 echo "100644 $o0 0 c" &&
885b9810
JH
401 echo "100644 $o1 0 d/e"
402 ) >expected &&
3af82863 403 test_cmp expected actual
885b9810
JH
404
405'
406
407test_expect_success 'merge-recursive d/f conflict' '
408
744747ef 409 rm -fr [abcd] &&
885b9810
JH
410 git reset --hard &&
411 git checkout -f "$c1" &&
412
67b6afe1 413 test_expect_code 1 git merge-recursive "$c0" -- "$c1" "$c6"
885b9810
JH
414'
415
416test_expect_success 'merge-recursive d/f conflict result' '
417
418 git ls-files -s >actual &&
419 (
b6c32f63
ES
420 echo "100644 $o1 0 a" &&
421 echo "100644 $o0 0 b" &&
422 echo "100644 $o0 0 c" &&
423 echo "100644 $o6 3 d" &&
424 echo "100644 $o0 1 d/e" &&
885b9810
JH
425 echo "100644 $o1 2 d/e"
426 ) >expected &&
3af82863 427 test_cmp expected actual
885b9810
JH
428
429'
430
431test_expect_success 'merge-recursive d/f conflict' '
432
744747ef 433 rm -fr [abcd] &&
885b9810
JH
434 git reset --hard &&
435 git checkout -f "$c6" &&
436
67b6afe1 437 test_expect_code 1 git merge-recursive "$c0" -- "$c6" "$c1"
885b9810
JH
438'
439
440test_expect_success 'merge-recursive d/f conflict result' '
441
442 git ls-files -s >actual &&
443 (
b6c32f63
ES
444 echo "100644 $o1 0 a" &&
445 echo "100644 $o0 0 b" &&
446 echo "100644 $o0 0 c" &&
447 echo "100644 $o6 2 d" &&
448 echo "100644 $o0 1 d/e" &&
885b9810
JH
449 echo "100644 $o1 3 d/e"
450 ) >expected &&
3af82863 451 test_cmp expected actual
885b9810
JH
452
453'
454
83e3ad3b
JT
455test_expect_success SYMLINKS 'dir in working tree with symlink ancestor does not produce d/f conflict' '
456 git init sym &&
457 (
458 cd sym &&
459 ln -s . foo &&
460 mkdir bar &&
461 >bar/file &&
462 git add foo bar/file &&
463 git commit -m "foo symlink" &&
464
465 git checkout -b branch1 &&
466 git commit --allow-empty -m "empty commit" &&
467
468 git checkout master &&
469 git rm foo &&
470 mkdir foo &&
471 >foo/bar &&
472 git add foo/bar &&
473 git commit -m "replace foo symlink with real foo dir and foo/bar file" &&
474
475 git checkout branch1 &&
476
477 git cherry-pick master &&
478 test_path_is_dir foo &&
479 test_path_is_file foo/bar
480 )
481'
482
885b9810
JH
483test_expect_success 'reset and 3-way merge' '
484
485 git reset --hard "$c2" &&
486 git read-tree -m "$c0" "$c2" "$c1"
487
488'
489
490test_expect_success 'reset and bind merge' '
491
492 git reset --hard master &&
493 git read-tree --prefix=M/ master &&
494 git ls-files -s >actual &&
495 (
b6c32f63
ES
496 echo "100644 $o1 0 M/a" &&
497 echo "100644 $o0 0 M/b" &&
498 echo "100644 $o0 0 M/c" &&
499 echo "100644 $o1 0 M/d/e" &&
500 echo "100644 $o1 0 a" &&
501 echo "100644 $o0 0 b" &&
502 echo "100644 $o0 0 c" &&
885b9810
JH
503 echo "100644 $o1 0 d/e"
504 ) >expected &&
3af82863 505 test_cmp expected actual &&
885b9810
JH
506
507 git read-tree --prefix=a1/ master &&
508 git ls-files -s >actual &&
509 (
b6c32f63
ES
510 echo "100644 $o1 0 M/a" &&
511 echo "100644 $o0 0 M/b" &&
512 echo "100644 $o0 0 M/c" &&
513 echo "100644 $o1 0 M/d/e" &&
514 echo "100644 $o1 0 a" &&
515 echo "100644 $o1 0 a1/a" &&
516 echo "100644 $o0 0 a1/b" &&
517 echo "100644 $o0 0 a1/c" &&
518 echo "100644 $o1 0 a1/d/e" &&
519 echo "100644 $o0 0 b" &&
520 echo "100644 $o0 0 c" &&
885b9810
JH
521 echo "100644 $o1 0 d/e"
522 ) >expected &&
a48fcd83 523 test_cmp expected actual &&
885b9810
JH
524
525 git read-tree --prefix=z/ master &&
526 git ls-files -s >actual &&
527 (
b6c32f63
ES
528 echo "100644 $o1 0 M/a" &&
529 echo "100644 $o0 0 M/b" &&
530 echo "100644 $o0 0 M/c" &&
531 echo "100644 $o1 0 M/d/e" &&
532 echo "100644 $o1 0 a" &&
533 echo "100644 $o1 0 a1/a" &&
534 echo "100644 $o0 0 a1/b" &&
535 echo "100644 $o0 0 a1/c" &&
536 echo "100644 $o1 0 a1/d/e" &&
537 echo "100644 $o0 0 b" &&
538 echo "100644 $o0 0 c" &&
539 echo "100644 $o1 0 d/e" &&
540 echo "100644 $o1 0 z/a" &&
541 echo "100644 $o0 0 z/b" &&
542 echo "100644 $o0 0 z/c" &&
885b9810
JH
543 echo "100644 $o1 0 z/d/e"
544 ) >expected &&
3af82863 545 test_cmp expected actual
885b9810
JH
546
547'
548
6e2068ae 549test_expect_success 'merge-recursive w/ empty work tree - ours has rename' '
29d9af58
BK
550 (
551 GIT_WORK_TREE="$PWD/ours-has-rename-work" &&
552 export GIT_WORK_TREE &&
553 GIT_INDEX_FILE="$PWD/ours-has-rename-index" &&
554 export GIT_INDEX_FILE &&
555 mkdir "$GIT_WORK_TREE" &&
40dc533f
SG
556 git read-tree -i -m $c7 2>actual-err &&
557 test_must_be_empty actual-err &&
558 git update-index --ignore-missing --refresh 2>actual-err &&
559 test_must_be_empty actual-err &&
560 git merge-recursive $c0 -- $c7 $c3 2>actual-err &&
561 test_must_be_empty actual-err &&
562 git ls-files -s >actual-files 2>actual-err &&
563 test_must_be_empty actual-err
564 ) &&
29d9af58
BK
565 cat >expected-files <<-EOF &&
566 100644 $o3 0 b/c
567 100644 $o0 0 c
568 100644 $o0 0 d/e
569 100644 $o0 0 e
570 EOF
40dc533f 571 test_cmp expected-files actual-files
29d9af58
BK
572'
573
574test_expect_success 'merge-recursive w/ empty work tree - theirs has rename' '
575 (
576 GIT_WORK_TREE="$PWD/theirs-has-rename-work" &&
577 export GIT_WORK_TREE &&
578 GIT_INDEX_FILE="$PWD/theirs-has-rename-index" &&
579 export GIT_INDEX_FILE &&
580 mkdir "$GIT_WORK_TREE" &&
40dc533f
SG
581 git read-tree -i -m $c3 2>actual-err &&
582 test_must_be_empty actual-err &&
583 git update-index --ignore-missing --refresh 2>actual-err &&
584 test_must_be_empty actual-err &&
585 git merge-recursive $c0 -- $c3 $c7 2>actual-err &&
586 test_must_be_empty actual-err &&
587 git ls-files -s >actual-files 2>actual-err &&
588 test_must_be_empty actual-err
589 ) &&
29d9af58
BK
590 cat >expected-files <<-EOF &&
591 100644 $o3 0 b/c
592 100644 $o0 0 c
593 100644 $o0 0 d/e
594 100644 $o0 0 e
595 EOF
40dc533f 596 test_cmp expected-files actual-files
29d9af58
BK
597'
598
41f13af5
AR
599test_expect_success 'merge removes empty directories' '
600
601 git reset --hard master &&
602 git checkout -b rm &&
603 git rm d/e &&
604 git commit -mremoved-d/e &&
605 git checkout master &&
606 git merge -s recursive rm &&
607 test_must_fail test -d d
608'
609
5423d2e7 610test_expect_success 'merge-recursive simple w/submodule' '
7d82b06d
JS
611
612 git checkout submod &&
613 git merge remove
614'
615
5423d2e7 616test_expect_success 'merge-recursive simple w/submodule result' '
7d82b06d
JS
617
618 git ls-files -s >actual &&
619 (
b6c32f63
ES
620 echo "100644 $o5 0 a" &&
621 echo "100644 $o0 0 c" &&
7d82b06d
JS
622 echo "160000 $c1 0 d"
623 ) >expected &&
624 test_cmp expected actual
625'
626
d5af5105
SK
627test_expect_success 'merge-recursive copy vs. rename' '
628 git checkout -f copy &&
629 git merge rename &&
630 ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
631 (
b6c32f63
ES
632 echo "100644 blob $o0 b" &&
633 echo "100644 blob $o0 c" &&
634 echo "100644 blob $o0 d/e" &&
635 echo "100644 blob $o0 e" &&
636 echo "100644 $o0 0 b" &&
637 echo "100644 $o0 0 c" &&
638 echo "100644 $o0 0 d/e" &&
d5af5105
SK
639 echo "100644 $o0 0 e"
640 ) >expected &&
641 test_cmp expected actual
642'
643
bba56042
JS
644test_expect_failure 'merge-recursive rename vs. rename/symlink' '
645
646 git checkout -f rename &&
647 git merge rename-ln &&
b6c32f63 648 ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
bba56042 649 (
b6c32f63
ES
650 echo "120000 blob $oln a" &&
651 echo "100644 blob $o0 b" &&
652 echo "100644 blob $o0 c" &&
653 echo "100644 blob $o0 d/e" &&
654 echo "100644 blob $o0 e" &&
655 echo "120000 $oln 0 a" &&
656 echo "100644 $o0 0 b" &&
657 echo "100644 $o0 0 c" &&
658 echo "100644 $o0 0 d/e" &&
bba56042
JS
659 echo "100644 $o0 0 e"
660 ) >expected &&
661 test_cmp expected actual
662'
8a1c0d32 663
6f50833e
JK
664test_expect_success 'merging with triple rename across D/F conflict' '
665 git reset --hard HEAD &&
666 git checkout -b main &&
667 git rm -rf . &&
668
669 echo "just a file" >sub1 &&
670 mkdir -p sub2 &&
671 echo content1 >sub2/file1 &&
672 echo content2 >sub2/file2 &&
673 echo content3 >sub2/file3 &&
674 mkdir simple &&
675 echo base >simple/bar &&
676 git add -A &&
677 test_tick &&
678 git commit -m base &&
679
680 git checkout -b other &&
681 echo more >>simple/bar &&
682 test_tick &&
683 git commit -a -m changesimplefile &&
684
685 git checkout main &&
686 git rm sub1 &&
687 git mv sub2 sub1 &&
688 test_tick &&
689 git commit -m changefiletodir &&
690
691 test_tick &&
692 git merge other
693'
8a1c0d32 694
a2571653
RS
695test_expect_success 'merge-recursive remembers the names of all base trees' '
696 git reset --hard HEAD &&
697
698 # more trees than static slots used by oid_to_hex()
699 for commit in $c0 $c2 $c4 $c5 $c6 $c7
700 do
701 git rev-parse "$commit^{tree}"
702 done >trees &&
703
704 # ignore the return code -- it only fails because the input is weird
705 test_must_fail git -c merge.verbosity=5 merge-recursive $(cat trees) -- $c1 $c3 >out &&
706
707 # merge-recursive prints in reverse order, but we do not care
708 sort <trees >expect &&
709 sed -n "s/^virtual //p" out | sort >actual &&
710 test_cmp expect actual
711'
712
f309e8e7
JH
713test_expect_success 'merge-recursive internal merge resolves to the sameness' '
714 git reset --hard HEAD &&
715
716 # We are going to create a history leading to two criss-cross
717 # branches A and B. The common ancestor at the bottom, O0,
718 # has two child commits O1 and O2, both of which will be merge
719 # base between A and B, like so:
720 #
721 # O1---A
722 # / \ /
723 # O0 .
724 # \ / \
725 # O2---B
726 #
727 # The recently added "check to see if the index is different from
728 # the tree into which something else is getting merged" check must
729 # NOT kick in when an inner merge between O1 and O2 is made. Both
730 # O1 and O2 happen to have the same tree as O0 in this test to
731 # trigger the bug---whether the inner merge is made by merging O2
732 # into O1 or O1 into O2, their common ancestor O0 and the branch
733 # being merged have the same tree. We should not trigger the "is
734 # the index dirty?" check in this case.
735
736 echo "zero" >file &&
737 git add file &&
738 test_tick &&
739 git commit -m "O0" &&
740 O0=$(git rev-parse HEAD) &&
741
742 test_tick &&
743 git commit --allow-empty -m "O1" &&
744 O1=$(git rev-parse HEAD) &&
745
746 git reset --hard $O0 &&
747 test_tick &&
748 git commit --allow-empty -m "O2" &&
749 O2=$(git rev-parse HEAD) &&
750
751 test_tick &&
752 git merge -s ours $O1 &&
753 B=$(git rev-parse HEAD) &&
754
755 git reset --hard $O1 &&
756 test_tick &&
757 git merge -s ours $O2 &&
758 A=$(git rev-parse HEAD) &&
759
760 git merge $B
761'
762
885b9810 763test_done