t3030: merge-recursive backend test.
We have fairly extensive coverage of read-tree 3-way machinery, and many Porcelain-ish tests use git-merge front-end tests, but we did not have good basic test for merge-recursive, which made it very hard to hack on it. I used this during the recent work to teach D/F conflicts to merge-recursive. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Apr 7, 2007 at 07:17 UTC
885b98107547fe3f6d17ca0af0578e040f7600d0
1 file changed
+528
t/t3030-merge-recursive.sh
new
+528
@@ -0,0 +1,528 @@
1
+#!/bin/sh
2
+
3
+test_description='merge-recursive backend test'
4
+
5
+. ./test-lib.sh
6
+
7
+test_expect_success 'setup 1' '
8
+
9
+ echo hello >a &&
10
+ o0=$(git hash-object a) &&
11
+ cp a b &&
12
+ cp a A &&
13
+ mkdir d &&
14
+ cp a d/e &&
15
+
16
+ test_tick &&
17
+ git add a b A d/e &&
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 &&
25
+
26
+ echo hello >>a &&
27
+ cp a d/e &&
28
+ o1=$(git hash-object a) &&
29
+
30
+ git add a d/e &&
31
+
32
+ test_tick &&
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 &&
36
+ (
37
+ echo "100644 blob $o0 A"
38
+ echo "100644 blob $o1 a"
39
+ echo "100644 blob $o0 b"
40
+ echo "100644 blob $o1 d/e"
41
+ echo "100644 $o0 0 A"
42
+ echo "100644 $o1 0 a"
43
+ echo "100644 $o0 0 b"
44
+ echo "100644 $o1 0 d/e"
45
+ ) >expected &&
46
+ git diff -u expected actual
47
+'
48
+
49
+test_expect_success 'setup 2' '
50
+
51
+ rm -rf [Aabd] &&
52
+ git checkout side &&
53
+ ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
54
+ (
55
+ echo "100644 blob $o0 A"
56
+ echo "100644 blob $o0 a"
57
+ echo "100644 blob $o0 b"
58
+ echo "100644 blob $o0 d/e"
59
+ echo "100644 $o0 0 A"
60
+ echo "100644 $o0 0 a"
61
+ echo "100644 $o0 0 b"
62
+ echo "100644 $o0 0 d/e"
63
+ ) >expected &&
64
+ git diff -u expected actual &&
65
+
66
+ echo goodbye >>a &&
67
+ o2=$(git hash-object a) &&
68
+
69
+ git add a &&
70
+
71
+ test_tick &&
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 &&
75
+ (
76
+ echo "100644 blob $o0 A"
77
+ echo "100644 blob $o2 a"
78
+ echo "100644 blob $o0 b"
79
+ echo "100644 blob $o0 d/e"
80
+ echo "100644 $o0 0 A"
81
+ echo "100644 $o2 0 a"
82
+ echo "100644 $o0 0 b"
83
+ echo "100644 $o0 0 d/e"
84
+ ) >expected &&
85
+ git diff -u expected actual
86
+'
87
+
88
+test_expect_success 'setup 3' '
89
+
90
+ rm -rf [Aabd] &&
91
+ git checkout df-1 &&
92
+ ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
93
+ (
94
+ echo "100644 blob $o0 A"
95
+ echo "100644 blob $o0 a"
96
+ echo "100644 blob $o0 b"
97
+ echo "100644 blob $o0 d/e"
98
+ echo "100644 $o0 0 A"
99
+ echo "100644 $o0 0 a"
100
+ echo "100644 $o0 0 b"
101
+ echo "100644 $o0 0 d/e"
102
+ ) >expected &&
103
+ git diff -u expected actual &&
104
+
105
+ rm -f b && mkdir b && echo df-1 >b/c && git add b/c &&
106
+ o3=$(git hash-object b/c) &&
107
+
108
+ test_tick &&
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 &&
112
+ (
113
+ echo "100644 blob $o0 A"
114
+ echo "100644 blob $o0 a"
115
+ echo "100644 blob $o3 b/c"
116
+ echo "100644 blob $o0 d/e"
117
+ echo "100644 $o0 0 A"
118
+ echo "100644 $o0 0 a"
119
+ echo "100644 $o3 0 b/c"
120
+ echo "100644 $o0 0 d/e"
121
+ ) >expected &&
122
+ git diff -u expected actual
123
+'
124
+
125
+test_expect_success 'setup 4' '
126
+
127
+ rm -rf [Aabd] &&
128
+ git checkout df-2 &&
129
+ ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
130
+ (
131
+ echo "100644 blob $o0 A"
132
+ echo "100644 blob $o0 a"
133
+ echo "100644 blob $o0 b"
134
+ echo "100644 blob $o0 d/e"
135
+ echo "100644 $o0 0 A"
136
+ echo "100644 $o0 0 a"
137
+ echo "100644 $o0 0 b"
138
+ echo "100644 $o0 0 d/e"
139
+ ) >expected &&
140
+ git diff -u expected actual &&
141
+
142
+ rm -f a && mkdir a && echo df-2 >a/c && git add a/c &&
143
+ o4=$(git hash-object a/c) &&
144
+
145
+ test_tick &&
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 &&
149
+ (
150
+ echo "100644 blob $o0 A"
151
+ echo "100644 blob $o4 a/c"
152
+ echo "100644 blob $o0 b"
153
+ echo "100644 blob $o0 d/e"
154
+ echo "100644 $o0 0 A"
155
+ echo "100644 $o4 0 a/c"
156
+ echo "100644 $o0 0 b"
157
+ echo "100644 $o0 0 d/e"
158
+ ) >expected &&
159
+ git diff -u expected actual
160
+'
161
+
162
+test_expect_success 'setup 5' '
163
+
164
+ rm -rf [Aabd] &&
165
+ git checkout remove &&
166
+ ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
167
+ (
168
+ echo "100644 blob $o0 A"
169
+ echo "100644 blob $o0 a"
170
+ echo "100644 blob $o0 b"
171
+ echo "100644 blob $o0 d/e"
172
+ echo "100644 $o0 0 A"
173
+ echo "100644 $o0 0 a"
174
+ echo "100644 $o0 0 b"
175
+ echo "100644 $o0 0 d/e"
176
+ ) >expected &&
177
+ git diff -u expected actual &&
178
+
179
+ rm -f b &&
180
+ echo remove-conflict >a &&
181
+
182
+ git add a &&
183
+ git rm b &&
184
+ o5=$(git hash-object a) &&
185
+
186
+ test_tick &&
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 &&
190
+ (
191
+ echo "100644 blob $o0 A"
192
+ echo "100644 blob $o5 a"
193
+ echo "100644 blob $o0 d/e"
194
+ echo "100644 $o0 0 A"
195
+ echo "100644 $o5 0 a"
196
+ echo "100644 $o0 0 d/e"
197
+ ) >expected &&
198
+ git diff -u expected actual
199
+
200
+'
201
+
202
+test_expect_success 'setup 6' '
203
+
204
+ rm -rf [Aabd] &&
205
+ git checkout df-3 &&
206
+ ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
207
+ (
208
+ echo "100644 blob $o0 A"
209
+ echo "100644 blob $o0 a"
210
+ echo "100644 blob $o0 b"
211
+ echo "100644 blob $o0 d/e"
212
+ echo "100644 $o0 0 A"
213
+ echo "100644 $o0 0 a"
214
+ echo "100644 $o0 0 b"
215
+ echo "100644 $o0 0 d/e"
216
+ ) >expected &&
217
+ git diff -u expected actual &&
218
+
219
+ rm -fr d && echo df-3 >d && git add d &&
220
+ o6=$(git hash-object d) &&
221
+
222
+ test_tick &&
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 &&
226
+ (
227
+ echo "100644 blob $o0 A"
228
+ echo "100644 blob $o0 a"
229
+ echo "100644 blob $o0 b"
230
+ echo "100644 blob $o6 d"
231
+ echo "100644 $o0 0 A"
232
+ echo "100644 $o0 0 a"
233
+ echo "100644 $o0 0 b"
234
+ echo "100644 $o6 0 d"
235
+ ) >expected &&
236
+ git diff -u expected actual
237
+'
238
+
239
+test_expect_success 'merge-recursive simple' '
240
+
241
+ rm -fr [Aabd] &&
242
+ git checkout -f "$c2" &&
243
+
244
+ git-merge-recursive "$c0" -- "$c2" "$c1"
245
+ status=$?
246
+ case "$status" in
247
+ 1)
248
+ : happy
249
+ ;;
250
+ *)
251
+ echo >&2 "why status $status!!!"
252
+ false
253
+ ;;
254
+ esac
255
+'
256
+
257
+test_expect_success 'merge-recursive result' '
258
+
259
+ git ls-files -s >actual &&
260
+ (
261
+ echo "100644 $o0 0 A"
262
+ echo "100644 $o0 1 a"
263
+ echo "100644 $o2 2 a"
264
+ echo "100644 $o1 3 a"
265
+ echo "100644 $o0 0 b"
266
+ echo "100644 $o1 0 d/e"
267
+ ) >expected &&
268
+ git diff -u expected actual
269
+
270
+'
271
+
272
+test_expect_success 'merge-recursive remove conflict' '
273
+
274
+ rm -fr [Aabd] &&
275
+ git checkout -f "$c1" &&
276
+
277
+ git-merge-recursive "$c0" -- "$c1" "$c5"
278
+ status=$?
279
+ case "$status" in
280
+ 1)
281
+ : happy
282
+ ;;
283
+ *)
284
+ echo >&2 "why status $status!!!"
285
+ false
286
+ ;;
287
+ esac
288
+'
289
+
290
+test_expect_success 'merge-recursive remove conflict' '
291
+
292
+ git ls-files -s >actual &&
293
+ (
294
+ echo "100644 $o0 0 A"
295
+ echo "100644 $o0 1 a"
296
+ echo "100644 $o1 2 a"
297
+ echo "100644 $o5 3 a"
298
+ echo "100644 $o1 0 d/e"
299
+ ) >expected &&
300
+ git diff -u expected actual
301
+
302
+'
303
+
304
+test_expect_success 'merge-recursive d/f simple' '
305
+ rm -fr [Aabd] &&
306
+ git reset --hard &&
307
+ git checkout -f "$c1" &&
308
+
309
+ git-merge-recursive "$c0" -- "$c1" "$c3"
310
+'
311
+
312
+test_expect_success 'merge-recursive result' '
313
+
314
+ git ls-files -s >actual &&
315
+ (
316
+ echo "100644 $o0 0 A"
317
+ echo "100644 $o1 0 a"
318
+ echo "100644 $o3 0 b/c"
319
+ echo "100644 $o1 0 d/e"
320
+ ) >expected &&
321
+ git diff -u expected actual
322
+
323
+'
324
+
325
+test_expect_success 'merge-recursive d/f conflict' '
326
+
327
+ rm -fr [Aabd] &&
328
+ git reset --hard &&
329
+ git checkout -f "$c1" &&
330
+
331
+ git-merge-recursive "$c0" -- "$c1" "$c4"
332
+ status=$?
333
+ case "$status" in
334
+ 1)
335
+ : happy
336
+ ;;
337
+ *)
338
+ echo >&2 "why status $status!!!"
339
+ false
340
+ ;;
341
+ esac
342
+'
343
+
344
+test_expect_success 'merge-recursive d/f conflict result' '
345
+
346
+ git ls-files -s >actual &&
347
+ (
348
+ echo "100644 $o0 0 A"
349
+ echo "100644 $o0 1 a"
350
+ echo "100644 $o1 2 a"
351
+ echo "100644 $o4 0 a/c"
352
+ echo "100644 $o0 0 b"
353
+ echo "100644 $o1 0 d/e"
354
+ ) >expected &&
355
+ git diff -u expected actual
356
+
357
+'
358
+
359
+test_expect_success 'merge-recursive d/f conflict the other way' '
360
+
361
+ rm -fr [Aabd] &&
362
+ git reset --hard &&
363
+ git checkout -f "$c4" &&
364
+
365
+ git-merge-recursive "$c0" -- "$c4" "$c1"
366
+ status=$?
367
+ case "$status" in
368
+ 1)
369
+ : happy
370
+ ;;
371
+ *)
372
+ echo >&2 "why status $status!!!"
373
+ false
374
+ ;;
375
+ esac
376
+'
377
+
378
+test_expect_success 'merge-recursive d/f conflict result the other way' '
379
+
380
+ git ls-files -s >actual &&
381
+ (
382
+ echo "100644 $o0 0 A"
383
+ echo "100644 $o0 1 a"
384
+ echo "100644 $o1 3 a"
385
+ echo "100644 $o4 0 a/c"
386
+ echo "100644 $o0 0 b"
387
+ echo "100644 $o1 0 d/e"
388
+ ) >expected &&
389
+ git diff -u expected actual
390
+
391
+'
392
+
393
+test_expect_success 'merge-recursive d/f conflict' '
394
+
395
+ rm -fr [Aabd] &&
396
+ git reset --hard &&
397
+ git checkout -f "$c1" &&
398
+
399
+ git-merge-recursive "$c0" -- "$c1" "$c6"
400
+ status=$?
401
+ case "$status" in
402
+ 1)
403
+ : happy
404
+ ;;
405
+ *)
406
+ echo >&2 "why status $status!!!"
407
+ false
408
+ ;;
409
+ esac
410
+'
411
+
412
+test_expect_success 'merge-recursive d/f conflict result' '
413
+
414
+ git ls-files -s >actual &&
415
+ (
416
+ echo "100644 $o0 0 A"
417
+ echo "100644 $o1 0 a"
418
+ echo "100644 $o0 0 b"
419
+ echo "100644 $o6 3 d"
420
+ echo "100644 $o0 1 d/e"
421
+ echo "100644 $o1 2 d/e"
422
+ ) >expected &&
423
+ git diff -u expected actual
424
+
425
+'
426
+
427
+test_expect_success 'merge-recursive d/f conflict' '
428
+
429
+ rm -fr [Aabd] &&
430
+ git reset --hard &&
431
+ git checkout -f "$c6" &&
432
+
433
+ git-merge-recursive "$c0" -- "$c6" "$c1"
434
+ status=$?
435
+ case "$status" in
436
+ 1)
437
+ : happy
438
+ ;;
439
+ *)
440
+ echo >&2 "why status $status!!!"
441
+ false
442
+ ;;
443
+ esac
444
+'
445
+
446
+test_expect_success 'merge-recursive d/f conflict result' '
447
+
448
+ git ls-files -s >actual &&
449
+ (
450
+ echo "100644 $o0 0 A"
451
+ echo "100644 $o1 0 a"
452
+ echo "100644 $o0 0 b"
453
+ echo "100644 $o6 2 d"
454
+ echo "100644 $o0 1 d/e"
455
+ echo "100644 $o1 3 d/e"
456
+ ) >expected &&
457
+ git diff -u expected actual
458
+
459
+'
460
+
461
+test_expect_success 'reset and 3-way merge' '
462
+
463
+ git reset --hard "$c2" &&
464
+ git read-tree -m "$c0" "$c2" "$c1"
465
+
466
+'
467
+
468
+test_expect_success 'reset and bind merge' '
469
+
470
+ git reset --hard master &&
471
+ git read-tree --prefix=M/ master &&
472
+ git ls-files -s >actual &&
473
+ (
474
+ echo "100644 $o0 0 A"
475
+ echo "100644 $o0 0 M/A"
476
+ echo "100644 $o1 0 M/a"
477
+ echo "100644 $o0 0 M/b"
478
+ echo "100644 $o1 0 M/d/e"
479
+ echo "100644 $o1 0 a"
480
+ echo "100644 $o0 0 b"
481
+ echo "100644 $o1 0 d/e"
482
+ ) >expected &&
483
+ git diff -u expected actual &&
484
+
485
+ git read-tree --prefix=a1/ master &&
486
+ git ls-files -s >actual &&
487
+ (
488
+ echo "100644 $o0 0 A"
489
+ echo "100644 $o0 0 M/A"
490
+ echo "100644 $o1 0 M/a"
491
+ echo "100644 $o0 0 M/b"
492
+ echo "100644 $o1 0 M/d/e"
493
+ echo "100644 $o1 0 a"
494
+ echo "100644 $o0 0 a1/A"
495
+ echo "100644 $o1 0 a1/a"
496
+ echo "100644 $o0 0 a1/b"
497
+ echo "100644 $o1 0 a1/d/e"
498
+ echo "100644 $o0 0 b"
499
+ echo "100644 $o1 0 d/e"
500
+ ) >expected &&
501
+ git diff -u expected actual
502
+
503
+ git read-tree --prefix=z/ master &&
504
+ git ls-files -s >actual &&
505
+ (
506
+ echo "100644 $o0 0 A"
507
+ echo "100644 $o0 0 M/A"
508
+ echo "100644 $o1 0 M/a"
509
+ echo "100644 $o0 0 M/b"
510
+ echo "100644 $o1 0 M/d/e"
511
+ echo "100644 $o1 0 a"
512
+ echo "100644 $o0 0 a1/A"
513
+ echo "100644 $o1 0 a1/a"
514
+ echo "100644 $o0 0 a1/b"
515
+ echo "100644 $o1 0 a1/d/e"
516
+ echo "100644 $o0 0 b"
517
+ echo "100644 $o1 0 d/e"
518
+ echo "100644 $o0 0 z/A"
519
+ echo "100644 $o1 0 z/a"
520
+ echo "100644 $o0 0 z/b"
521
+ echo "100644 $o1 0 z/d/e"
522
+ ) >expected &&
523
+ git diff -u expected actual
524
+
525
+'
526
+
527
+test_done
528
+