summaryrefslogtreecommitdiff
path: root/t/t6046-merge-skip-unneeded-updates.sh
blob: fcefffcaece290f4070aceb9ddf6b5579447f104 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
#!/bin/sh
 
test_description="merge cases"
 
# The setup for all of them, pictorially, is:
#
#      A
#      o
#     / \
#  O o   ?
#     \ /
#      o
#      B
#
# To help make it easier to follow the flow of tests, they have been
# divided into sections and each test will start with a quick explanation
# of what commits O, A, and B contain.
#
# Notation:
#    z/{b,c}   means  files z/b and z/c both exist
#    x/d_1     means  file x/d exists with content d1.  (Purpose of the
#                     underscore notation is to differentiate different
#                     files that might be renamed into each other's paths.)
 
. ./test-lib.sh
 
 
###########################################################################
# SECTION 1: Cases involving no renames (one side has subset of changes of
#            the other side)
###########################################################################
 
# Testcase 1a, Changes on A, subset of changes on B
#   Commit O: b_1
#   Commit A: b_2
#   Commit B: b_3
#   Expected: b_2
 
test_expect_success '1a-setup: Modify(A)/Modify(B), change on B subset of A' '
	test_create_repo 1a &&
	(
		cd 1a &&
 
		test_write_lines 1 2 3 4 5 6 7 8 9 10 >b &&
		git add b &&
		test_tick &&
		git commit -m "O" &&
 
		git branch O &&
		git branch A &&
		git branch B &&
 
		git checkout A &&
		test_write_lines 1 2 3 4 5 5.5 6 7 8 9 10 10.5 >b &&
		git add b &&
		test_tick &&
		git commit -m "A" &&
 
		git checkout B &&
		test_write_lines 1 2 3 4 5 5.5 6 7 8 9 10 >b &&
		git add b &&
		test_tick &&
		git commit -m "B"
	)
'
 
test_expect_success '1a-check-L: Modify(A)/Modify(B), change on B subset of A' '
	test_when_finished "git -C 1a reset --hard" &&
	test_when_finished "git -C 1a clean -fd" &&
	(
		cd 1a &&
 
		git checkout A^0 &&
 
		test-tool chmtime =31337 b &&
		test-tool chmtime -v +0 b >expected-mtime &&
 
		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
 
		test_i18ngrep "Skipped b" out &&
		test_must_be_empty err &&
 
		test-tool chmtime -v +0 b >actual-mtime &&
		test_cmp expected-mtime actual-mtime &&
 
		git ls-files -s >index_files &&
		test_line_count = 1 index_files &&
 
		git rev-parse >actual HEAD:b &&
		git rev-parse >expect A:b &&
		test_cmp expect actual &&
 
		git hash-object b   >actual &&
		git rev-parse   A:b >expect &&
		test_cmp expect actual
	)
'
 
test_expect_success '1a-check-R: Modify(A)/Modify(B), change on B subset of A' '
	test_when_finished "git -C 1a reset --hard" &&
	test_when_finished "git -C 1a clean -fd" &&
	(
		cd 1a &&
 
		git checkout B^0 &&
 
		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
 
		test_i18ngrep "Auto-merging b" out &&
		test_must_be_empty err &&
 
		git ls-files -s >index_files &&
		test_line_count = 1 index_files &&
 
		git rev-parse >actual HEAD:b &&
		git rev-parse >expect A:b &&
		test_cmp expect actual &&
 
		git hash-object b   >actual &&
		git rev-parse   A:b >expect &&
		test_cmp expect actual
	)
'
 
 
###########################################################################
# SECTION 2: Cases involving basic renames
###########################################################################
 
# Testcase 2a, Changes on A, rename on B
#   Commit O: b_1
#   Commit A: b_2
#   Commit B: c_1
#   Expected: c_2
 
test_expect_success '2a-setup: Modify(A)/rename(B)' '
	test_create_repo 2a &&
	(
		cd 2a &&
 
		test_seq 1 10 >b &&
		git add b &&
		test_tick &&
		git commit -m "O" &&
 
		git branch O &&
		git branch A &&
		git branch B &&
 
		git checkout A &&
		test_seq 1 11 >b &&
		git add b &&
		test_tick &&
		git commit -m "A" &&
 
		git checkout B &&
		git mv b c &&
		test_tick &&
		git commit -m "B"
	)
'
 
test_expect_success '2a-check-L: Modify/rename, merge into modify side' '
	test_when_finished "git -C 2a reset --hard" &&
	test_when_finished "git -C 2a clean -fd" &&
	(
		cd 2a &&
 
		git checkout A^0 &&
 
		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
 
		test_i18ngrep ! "Skipped c" out &&
		test_must_be_empty err &&
 
		git ls-files -s >index_files &&
		test_line_count = 1 index_files &&
 
		git rev-parse >actual HEAD:c &&
		git rev-parse >expect A:b &&
		test_cmp expect actual &&
 
		git hash-object c   >actual &&
		git rev-parse   A:b >expect &&
		test_cmp expect actual &&
 
		test_must_fail git rev-parse HEAD:b &&
		test_path_is_missing b
	)
'
 
test_expect_success '2a-check-R: Modify/rename, merge into rename side' '
	test_when_finished "git -C 2a reset --hard" &&
	test_when_finished "git -C 2a clean -fd" &&
	(
		cd 2a &&
 
		git checkout B^0 &&
 
		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
 
		test_i18ngrep ! "Skipped c" out &&
		test_must_be_empty err &&
 
		git ls-files -s >index_files &&
		test_line_count = 1 index_files &&
 
		git rev-parse >actual HEAD:c &&
		git rev-parse >expect A:b &&
		test_cmp expect actual &&
 
		git hash-object c   >actual &&
		git rev-parse   A:b >expect &&
		test_cmp expect actual &&
 
		test_must_fail git rev-parse HEAD:b &&
		test_path_is_missing b
	)
'
 
# Testcase 2b, Changed and renamed on A, subset of changes on B
#   Commit O: b_1
#   Commit A: c_2
#   Commit B: b_3
#   Expected: c_2
 
test_expect_success '2b-setup: Rename+Mod(A)/Mod(B), B mods subset of A' '
	test_create_repo 2b &&
	(
		cd 2b &&
 
		test_write_lines 1 2 3 4 5 6 7 8 9 10 >b &&
		git add b &&
		test_tick &&
		git commit -m "O" &&
 
		git branch O &&
		git branch A &&
		git branch B &&
 
		git checkout A &&
		test_write_lines 1 2 3 4 5 5.5 6 7 8 9 10 10.5 >b &&
		git add b &&
		git mv b c &&
		test_tick &&
		git commit -m "A" &&
 
		git checkout B &&
		test_write_lines 1 2 3 4 5 5.5 6 7 8 9 10 >b &&
		git add b &&
		test_tick &&
		git commit -m "B"
	)
'
 
test_expect_success '2b-check-L: Rename+Mod(A)/Mod(B), B mods subset of A' '
	test_when_finished "git -C 2b reset --hard" &&
	test_when_finished "git -C 2b clean -fd" &&
	(
		cd 2b &&
 
		git checkout A^0 &&
 
		test-tool chmtime =31337 c &&
		test-tool chmtime -v +0 c >expected-mtime &&
 
		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
 
		test_i18ngrep "Skipped c" out &&
		test_must_be_empty err &&
 
		test-tool chmtime -v +0 c >actual-mtime &&
		test_cmp expected-mtime actual-mtime &&
 
		git ls-files -s >index_files &&
		test_line_count = 1 index_files &&
 
		git rev-parse >actual HEAD:c &&
		git rev-parse >expect A:c &&
		test_cmp expect actual &&
 
		git hash-object c   >actual &&
		git rev-parse   A:c >expect &&
		test_cmp expect actual &&
 
		test_must_fail git rev-parse HEAD:b &&
		test_path_is_missing b
	)
'
 
test_expect_success '2b-check-R: Rename+Mod(A)/Mod(B), B mods subset of A' '
	test_when_finished "git -C 2b reset --hard" &&
	test_when_finished "git -C 2b clean -fd" &&
	(
		cd 2b &&
 
		git checkout B^0 &&
 
		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
 
		test_i18ngrep "Auto-merging c" out &&
		test_must_be_empty err &&
 
		git ls-files -s >index_files &&
		test_line_count = 1 index_files &&
 
		git rev-parse >actual HEAD:c &&
		git rev-parse >expect A:c &&
		test_cmp expect actual &&
 
		git hash-object c   >actual &&
		git rev-parse   A:c >expect &&
		test_cmp expect actual &&
 
		test_must_fail git rev-parse HEAD:b &&
		test_path_is_missing b
	)
'
 
# Testcase 2c, Changes on A, rename on B
#   Commit O: b_1
#   Commit A: b_2, c_3
#   Commit B: c_1
#   Expected: rename/add conflict c_2 vs c_3
#
#   NOTE: Since A modified b_1->b_2, and B renamed b_1->c_1, the threeway
#         merge of those files should result in c_2.  We then should have a
#         rename/add conflict between c_2 and c_3.  However, if we note in
#         merge_content() that A had the right contents (b_2 has same
#         contents as c_2, just at a different name), and that A had the
#         right path present (c_3 existed) and thus decides that it can
#         skip the update, then we're in trouble.  This test verifies we do
#         not make that particular mistake.
 
test_expect_success '2c-setup: Modify b & add c VS rename b->c' '
	test_create_repo 2c &&
	(
		cd 2c &&
 
		test_seq 1 10 >b &&
		git add b &&
		test_tick &&
		git commit -m "O" &&
 
		git branch O &&
		git branch A &&
		git branch B &&
 
		git checkout A &&
		test_seq 1 11 >b &&
		echo whatever >c &&
		git add b c &&
		test_tick &&
		git commit -m "A" &&
 
		git checkout B &&
		git mv b c &&
		test_tick &&
		git commit -m "B"
	)
'
 
test_expect_success '2c-check: Modify b & add c VS rename b->c' '
	(
		cd 2c &&
 
		git checkout A^0 &&
 
		GIT_MERGE_VERBOSITY=3 test_must_fail git merge -s recursive B^0 >out 2>err &&
 
		test_i18ngrep "CONFLICT (rename/add): Rename b->c" out &&
		test_i18ngrep ! "Skipped c" out &&
		test_must_be_empty err
 
		# FIXME: rename/add conflicts are horribly broken right now;
		# when I get back to my patch series fixing it and
		# rename/rename(2to1) conflicts to bring them in line with
		# how add/add conflicts behave, then checks like the below
		# could be added.  But that patch series is waiting until
		# the rename-directory-detection series lands, which this
		# is part of.  And in the mean time, I do not want to further
		# enforce broken behavior.  So for now, the main test is the
		# one above that err is an empty file.
 
		#git ls-files -s >index_files &&
		#test_line_count = 2 index_files &&
 
		#git rev-parse >actual :2:c :3:c &&
		#git rev-parse >expect A:b  A:c  &&
		#test_cmp expect actual &&
 
		#git cat-file -p A:b >>merged &&
		#git cat-file -p A:c >>merge-me &&
		#>empty &&
		#test_must_fail git merge-file \
		#	-L "Temporary merge branch 1" \
		#	-L "" \
		#	-L "Temporary merge branch 2" \
		#	merged empty merge-me &&
		#sed -e "s/^\([<=>]\)/\1\1\1/" merged >merged-internal &&
 
		#git hash-object c               >actual &&
		#git hash-object merged-internal >expect &&
		#test_cmp expect actual &&
 
		#test_path_is_missing b
	)
'
 
 
###########################################################################
# SECTION 3: Cases involving directory renames
#
# NOTE:
#   Directory renames only apply when one side renames a directory, and the
#   other side adds or renames a path into that directory.  Applying the
#   directory rename to that new path creates a new pathname that didn't
#   exist on either side of history.  Thus, it is impossible for the
#   merge contents to already be at the right path, so all of these checks
#   exist just to make sure that updates are not skipped.
###########################################################################
 
# Testcase 3a, Change + rename into dir foo on A, dir rename foo->bar on B
#   Commit O: bq_1, foo/whatever
#   Commit A: foo/{bq_2, whatever}
#   Commit B: bq_1, bar/whatever
#   Expected: bar/{bq_2, whatever}
 
test_expect_success '3a-setup: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
	test_create_repo 3a &&
	(
		cd 3a &&
 
		mkdir foo &&
		test_seq 1 10 >bq &&
		test_write_lines a b c d e f g h i j k >foo/whatever &&
		git add bq foo/whatever &&
		test_tick &&
		git commit -m "O" &&
 
		git branch O &&
		git branch A &&
		git branch B &&
 
		git checkout A &&
		test_seq 1 11 >bq &&
		git add bq &&
		git mv bq foo/ &&
		test_tick &&
		git commit -m "A" &&
 
		git checkout B &&
		git mv foo/ bar/ &&
		test_tick &&
		git commit -m "B"
	)
'
 
test_expect_success '3a-check-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
	test_when_finished "git -C 3a reset --hard" &&
	test_when_finished "git -C 3a clean -fd" &&
	(
		cd 3a &&
 
		git checkout A^0 &&
 
		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
 
		test_i18ngrep ! "Skipped bar/bq" out &&
		test_must_be_empty err &&
 
		git ls-files -s >index_files &&
		test_line_count = 2 index_files &&
 
		git rev-parse >actual HEAD:bar/bq HEAD:bar/whatever &&
		git rev-parse >expect A:foo/bq    A:foo/whatever &&
		test_cmp expect actual &&
 
		git hash-object bar/bq   bar/whatever   >actual &&
		git rev-parse   A:foo/bq A:foo/whatever >expect &&
		test_cmp expect actual &&
 
		test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
		test_path_is_missing bq foo/bq foo/whatever
	)
'
 
test_expect_success '3a-check-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
	test_when_finished "git -C 3a reset --hard" &&
	test_when_finished "git -C 3a clean -fd" &&
	(
		cd 3a &&
 
		git checkout B^0 &&
 
		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
 
		test_i18ngrep ! "Skipped bar/bq" out &&
		test_must_be_empty err &&
 
		git ls-files -s >index_files &&
		test_line_count = 2 index_files &&
 
		git rev-parse >actual HEAD:bar/bq HEAD:bar/whatever &&
		git rev-parse >expect A:foo/bq    A:foo/whatever &&
		test_cmp expect actual &&
 
		git hash-object bar/bq   bar/whatever   >actual &&
		git rev-parse   A:foo/bq A:foo/whatever >expect &&
		test_cmp expect actual &&
 
		test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
		test_path_is_missing bq foo/bq foo/whatever
	)
'
 
# Testcase 3b, rename into dir foo on A, dir rename foo->bar + change on B
#   Commit O: bq_1, foo/whatever
#   Commit A: foo/{bq_1, whatever}
#   Commit B: bq_2, bar/whatever
#   Expected: bar/{bq_2, whatever}
 
test_expect_success '3b-setup: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
	test_create_repo 3b &&
	(
		cd 3b &&
 
		mkdir foo &&
		test_seq 1 10 >bq &&
		test_write_lines a b c d e f g h i j k >foo/whatever &&
		git add bq foo/whatever &&
		test_tick &&
		git commit -m "O" &&
 
		git branch O &&
		git branch A &&
		git branch B &&
 
		git checkout A &&
		git mv bq foo/ &&
		test_tick &&
		git commit -m "A" &&
 
		git checkout B &&
		test_seq 1 11 >bq &&
		git add bq &&
		git mv foo/ bar/ &&
		test_tick &&
		git commit -m "B"
	)
'
 
test_expect_success '3b-check-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
	test_when_finished "git -C 3b reset --hard" &&
	test_when_finished "git -C 3b clean -fd" &&
	(
		cd 3b &&
 
		git checkout A^0 &&
 
		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
 
		test_i18ngrep ! "Skipped bar/bq" out &&
		test_must_be_empty err &&
 
		git ls-files -s >index_files &&
		test_line_count = 2 index_files &&
 
		git rev-parse >actual HEAD:bar/bq HEAD:bar/whatever &&
		git rev-parse >expect B:bq        A:foo/whatever &&
		test_cmp expect actual &&
 
		git hash-object bar/bq bar/whatever   >actual &&
		git rev-parse   B:bq   A:foo/whatever >expect &&
		test_cmp expect actual &&
 
		test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
		test_path_is_missing bq foo/bq foo/whatever
	)
'
 
test_expect_success '3b-check-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
	test_when_finished "git -C 3b reset --hard" &&
	test_when_finished "git -C 3b clean -fd" &&
	(
		cd 3b &&
 
		git checkout B^0 &&
 
		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
 
		test_i18ngrep ! "Skipped bar/bq" out &&
		test_must_be_empty err &&
 
		git ls-files -s >index_files &&
		test_line_count = 2 index_files &&
 
		git rev-parse >actual HEAD:bar/bq HEAD:bar/whatever &&
		git rev-parse >expect B:bq        A:foo/whatever &&
		test_cmp expect actual &&
 
		git hash-object bar/bq bar/whatever   >actual &&
		git rev-parse   B:bq   A:foo/whatever >expect &&
		test_cmp expect actual &&
 
		test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
		test_path_is_missing bq foo/bq foo/whatever
	)
'
 
###########################################################################
# SECTION 4: Cases involving dirty changes
###########################################################################
 
# Testcase 4a, Changed on A, subset of changes on B, locally modified
#   Commit O: b_1
#   Commit A: b_2
#   Commit B: b_3
#   Working copy: b_4
#   Expected: b_2 for merge, b_4 in working copy
 
test_expect_success '4a-setup: Change on A, change on B subset of A, dirty mods present' '
	test_create_repo 4a &&
	(
		cd 4a &&
 
		test_write_lines 1 2 3 4 5 6 7 8 9 10 >b &&
		git add b &&
		test_tick &&
		git commit -m "O" &&
 
		git branch O &&
		git branch A &&
		git branch B &&
 
		git checkout A &&
		test_write_lines 1 2 3 4 5 5.5 6 7 8 9 10 10.5 >b &&
		git add b &&
		test_tick &&
		git commit -m "A" &&
 
		git checkout B &&
		test_write_lines 1 2 3 4 5 5.5 6 7 8 9 10 >b &&
		git add b &&
		test_tick &&
		git commit -m "B"
	)
'
 
# NOTE: For as long as we continue using unpack_trees() without index_only
#   set to true, it will error out on a case like this claiming the the locally
#   modified file would be overwritten by the merge.  Getting this testcase
#   correct requires doing the merge in-memory first, then realizing that no
#   updates to the file are necessary, and thus that we can just leave the path
#   alone.
test_expect_failure '4a-check: Change on A, change on B subset of A, dirty mods present' '
	test_when_finished "git -C 4a reset --hard" &&
	test_when_finished "git -C 4a clean -fd" &&
	(
		cd 4a &&
 
		git checkout A^0 &&
		echo "File rewritten" >b &&
 
		test-tool chmtime =31337 b &&
		test-tool chmtime -v +0 b >expected-mtime &&
 
		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
 
		test_i18ngrep "Skipped b" out &&
		test_must_be_empty err &&
 
		test-tool chmtime -v +0 b >actual-mtime &&
		test_cmp expected-mtime actual-mtime &&
 
		git ls-files -s >index_files &&
		test_line_count = 1 index_files &&
 
		git rev-parse >actual :0:b &&
		git rev-parse >expect A:b &&
		test_cmp expect actual &&
 
		git hash-object b >actual &&
		echo "File rewritten" | git hash-object --stdin >expect &&
		test_cmp expect actual
	)
'
 
# Testcase 4b, Changed+renamed on A, subset of changes on B, locally modified
#   Commit O: b_1
#   Commit A: c_2
#   Commit B: b_3
#   Working copy: c_4
#   Expected: c_2
 
test_expect_success '4b-setup: Rename+Mod(A)/Mod(B), change on B subset of A, dirty mods present' '
	test_create_repo 4b &&
	(
		cd 4b &&
 
		test_write_lines 1 2 3 4 5 6 7 8 9 10 >b &&
		git add b &&
		test_tick &&
		git commit -m "O" &&
 
		git branch O &&
		git branch A &&
		git branch B &&
 
		git checkout A &&
		test_write_lines 1 2 3 4 5 5.5 6 7 8 9 10 10.5 >b &&
		git add b &&
		git mv b c &&
		test_tick &&
		git commit -m "A" &&
 
		git checkout B &&
		test_write_lines 1 2 3 4 5 5.5 6 7 8 9 10 >b &&
		git add b &&
		test_tick &&
		git commit -m "B"
	)
'
 
test_expect_success '4b-check: Rename+Mod(A)/Mod(B), change on B subset of A, dirty mods present' '
	test_when_finished "git -C 4b reset --hard" &&
	test_when_finished "git -C 4b clean -fd" &&
	(
		cd 4b &&
 
		git checkout A^0 &&
		echo "File rewritten" >c &&
 
		test-tool chmtime =31337 c &&
		test-tool chmtime -v +0 c >expected-mtime &&
 
		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
 
		test_i18ngrep "Skipped c" out &&
		test_must_be_empty err &&
 
		test-tool chmtime -v +0 c >actual-mtime &&
		test_cmp expected-mtime actual-mtime &&
 
		git ls-files -s >index_files &&
		test_line_count = 1 index_files &&
 
		git rev-parse >actual :0:c &&
		git rev-parse >expect A:c &&
		test_cmp expect actual &&
 
		git hash-object c >actual &&
		echo "File rewritten" | git hash-object --stdin >expect &&
		test_cmp expect actual &&
 
		test_must_fail git rev-parse HEAD:b &&
		test_path_is_missing b
	)
'
 
test_done