]> git.ipfire.org Git - thirdparty/git.git/blame - t/t7600-merge.sh
hashmap: use *_entry APIs for iteration
[thirdparty/git.git] / t / t7600-merge.sh
CommitLineData
a85d1b69
LH
1#!/bin/sh
2#
3# Copyright (c) 2007 Lars Hjemli
4#
5
47a528ad 6test_description='git merge
a85d1b69 7
4c073457
JN
8Testing basic merge operations/option parsing.
9
10! [c0] commit 0
11 ! [c1] commit 1
12 ! [c2] commit 2
13 ! [c3] commit 3
14 ! [c4] c4
15 ! [c5] c5
16 ! [c6] c6
17 * [master] Merge commit 'c1'
18--------
19 - [master] Merge commit 'c1'
20 + * [c1] commit 1
21 + [c6] c6
22 + [c5] c5
23 ++ [c4] c4
24 ++++ [c3] commit 3
25 + [c2] commit 2
26+++++++* [c0] commit 0
27'
a85d1b69
LH
28
29. ./test-lib.sh
b5c9f1c1 30. "$TEST_DIRECTORY"/lib-gpg.sh
a85d1b69 31
73151df0
JN
32printf '%s\n' 1 2 3 4 5 6 7 8 9 >file
33printf '%s\n' '1 X' 2 3 4 5 6 7 8 9 >file.1
34printf '%s\n' 1 2 3 4 '5 X' 6 7 8 9 >file.5
35printf '%s\n' 1 2 3 4 5 6 7 8 '9 X' >file.9
b64c1e07 36printf '%s\n' 1 2 3 4 5 6 7 8 '9 Y' >file.9y
73151df0
JN
37printf '%s\n' '1 X' 2 3 4 5 6 7 8 9 >result.1
38printf '%s\n' '1 X' 2 3 4 '5 X' 6 7 8 9 >result.1-5
39printf '%s\n' '1 X' 2 3 4 '5 X' 6 7 8 '9 X' >result.1-5-9
b64c1e07 40printf '%s\n' 1 2 3 4 5 6 7 8 '9 Z' >result.9z
4c073457 41
73151df0 42create_merge_msgs () {
57b58db7
JH
43 echo "Merge tag 'c2'" >msg.1-5 &&
44 echo "Merge tags 'c2' and 'c3'" >msg.1-5-9 &&
73151df0
JN
45 {
46 echo "Squashed commit of the following:" &&
47 echo &&
48 git log --no-merges ^HEAD c1
49 } >squash.1 &&
50 {
51 echo "Squashed commit of the following:" &&
52 echo &&
53 git log --no-merges ^HEAD c2
54 } >squash.1-5 &&
55 {
56 echo "Squashed commit of the following:" &&
57 echo &&
58 git log --no-merges ^HEAD c2 c3
59 } >squash.1-5-9 &&
73151df0 60 {
57b58db7 61 echo "* tag 'c3':" &&
ad2f7255 62 echo " commit 3"
73151df0
JN
63 } >msg.log
64}
4c073457 65
73151df0
JN
66verify_merge () {
67 test_cmp "$2" "$1" &&
68 git update-index --refresh &&
69 git diff --exit-code &&
70 if test -n "$3"
71 then
ad2f7255 72 git show -s --pretty=tformat:%s HEAD >msg.act &&
73151df0
JN
73 test_cmp "$3" msg.act
74 fi
75}
4c073457 76
73151df0
JN
77verify_head () {
78 echo "$1" >head.expected &&
79 git rev-parse HEAD >head.actual &&
80 test_cmp head.expected head.actual
81}
4c073457 82
73151df0
JN
83verify_parents () {
84 printf '%s\n' "$@" >parents.expected &&
85 >parents.actual &&
86 i=1 &&
87 while test $i -le $#
88 do
89 git rev-parse HEAD^$i >>parents.actual &&
90 i=$(expr $i + 1) ||
91 return 1
92 done &&
3fc0dbf0 93 test_must_fail git rev-parse --verify "HEAD^$i" &&
73151df0
JN
94 test_cmp parents.expected parents.actual
95}
a85d1b69 96
73151df0
JN
97verify_mergeheads () {
98 printf '%s\n' "$@" >mergehead.expected &&
274a5c06
JH
99 while read sha1 rest
100 do
101 git rev-parse $sha1
102 done <.git/MERGE_HEAD >mergehead.actual &&
103 test_cmp mergehead.expected mergehead.actual
73151df0 104}
a85d1b69 105
73151df0
JN
106verify_no_mergehead () {
107 ! test -e .git/MERGE_HEAD
108}
a85d1b69
LH
109
110test_expect_success 'setup' '
111 git add file &&
112 test_tick &&
113 git commit -m "commit 0" &&
114 git tag c0 &&
115 c0=$(git rev-parse HEAD) &&
116 cp file.1 file &&
117 git add file &&
118 test_tick &&
119 git commit -m "commit 1" &&
120 git tag c1 &&
121 c1=$(git rev-parse HEAD) &&
122 git reset --hard "$c0" &&
123 cp file.5 file &&
124 git add file &&
125 test_tick &&
126 git commit -m "commit 2" &&
127 git tag c2 &&
128 c2=$(git rev-parse HEAD) &&
129 git reset --hard "$c0" &&
b64c1e07
SS
130 cp file.9y file &&
131 git add file &&
132 test_tick &&
133 git commit -m "commit 7" &&
134 git tag c7 &&
135 git reset --hard "$c0" &&
a85d1b69
LH
136 cp file.9 file &&
137 git add file &&
138 test_tick &&
139 git commit -m "commit 3" &&
140 git tag c3 &&
99094a7a 141 c3=$(git rev-parse HEAD) &&
a85d1b69
LH
142 git reset --hard "$c0" &&
143 create_merge_msgs
144'
145
df516fb5 146test_debug 'git log --graph --decorate --oneline --all'
a85d1b69 147
74f5b7fb 148test_expect_success 'test option parsing' '
01941bd5
JS
149 test_must_fail git merge -$ c1 &&
150 test_must_fail git merge --no-such c1 &&
151 test_must_fail git merge -s foobar c1 &&
152 test_must_fail git merge -s=foobar c1 &&
153 test_must_fail git merge -m &&
042e290d
CP
154 test_must_fail git merge --abort foobar &&
155 test_must_fail git merge --abort --quiet &&
367ff694
CP
156 test_must_fail git merge --continue foobar &&
157 test_must_fail git merge --continue --quiet &&
01941bd5 158 test_must_fail git merge
a85d1b69
LH
159'
160
da53eec6
NTND
161test_expect_success 'merge -h with invalid index' '
162 mkdir broken &&
163 (
164 cd broken &&
165 git init &&
166 >.git/index &&
167 test_expect_code 129 git merge -h 2>usage
168 ) &&
9a001381 169 test_i18ngrep "[Uu]sage: git merge" broken/usage
da53eec6
NTND
170'
171
dce61e72
MV
172test_expect_success 'reject non-strategy with a git-merge-foo name' '
173 test_must_fail git merge -s index c1
174'
175
a85d1b69 176test_expect_success 'merge c0 with c1' '
ff372c78
JN
177 echo "OBJID HEAD@{0}: merge c1: Fast-forward" >reflog.expected &&
178
a85d1b69
LH
179 git reset --hard c0 &&
180 git merge c1 &&
181 verify_merge file result.1 &&
ff372c78
JN
182 verify_head "$c1" &&
183
184 git reflog -1 >reflog.actual &&
185 sed "s/$_x05[0-9a-f]*/OBJID/g" reflog.actual >reflog.fuzzy &&
186 test_cmp reflog.expected reflog.fuzzy
a85d1b69
LH
187'
188
df516fb5 189test_debug 'git log --graph --decorate --oneline --all'
a85d1b69 190
13474835
BG
191test_expect_success 'merge c0 with c1 with --ff-only' '
192 git reset --hard c0 &&
193 git merge --ff-only c1 &&
194 git merge --ff-only HEAD c0 c1 &&
195 verify_merge file result.1 &&
196 verify_head "$c1"
197'
198
df516fb5 199test_debug 'git log --graph --decorate --oneline --all'
94d63ce2
JN
200
201test_expect_success 'merge from unborn branch' '
202 git checkout -f master &&
203 test_might_fail git branch -D kid &&
204
205 echo "OBJID HEAD@{0}: initial pull" >reflog.expected &&
206
207 git checkout --orphan kid &&
208 test_when_finished "git checkout -f master" &&
209 git rm -fr . &&
210 test_tick &&
211 git merge --ff-only c1 &&
212 verify_merge file result.1 &&
213 verify_head "$c1" &&
214
215 git reflog -1 >reflog.actual &&
216 sed "s/$_x05[0-9a-f][0-9a-f]/OBJID/g" reflog.actual >reflog.fuzzy &&
217 test_cmp reflog.expected reflog.fuzzy
218'
219
220test_debug 'git log --graph --decorate --oneline --all'
13474835 221
a85d1b69
LH
222test_expect_success 'merge c1 with c2' '
223 git reset --hard c1 &&
224 test_tick &&
225 git merge c2 &&
226 verify_merge file result.1-5 msg.1-5 &&
227 verify_parents $c1 $c2
228'
229
b64c1e07
SS
230test_expect_success 'merge --squash c3 with c7' '
231 git reset --hard c3 &&
232 test_must_fail git merge --squash c7 &&
233 cat result.9z >file &&
234 git commit --no-edit -a &&
235
b510f0be
DL
236 cat >expect <<-EOF &&
237 Squashed commit of the following:
b64c1e07 238
b510f0be 239 $(git show -s c7)
b64c1e07 240
b510f0be
DL
241 # Conflicts:
242 # file
243 EOF
244 git cat-file commit HEAD >raw &&
245 sed -e '1,/^$/d' raw >actual &&
b64c1e07
SS
246 test_cmp expect actual
247'
248
1055997e
DL
249test_expect_success 'merge c3 with c7 with commit.cleanup = scissors' '
250 git config commit.cleanup scissors &&
251 git reset --hard c3 &&
252 test_must_fail git merge c7 &&
253 cat result.9z >file &&
254 git commit --no-edit -a &&
255
256 cat >expect <<-\EOF &&
257 Merge tag '"'"'c7'"'"'
258
259 # ------------------------ >8 ------------------------
260 # Do not modify or remove the line above.
261 # Everything below it will be ignored.
262 #
263 # Conflicts:
264 # file
265 EOF
266 git cat-file commit HEAD >raw &&
267 sed -e '1,/^$/d' raw >actual &&
268 test_i18ncmp expect actual
269'
270
271test_expect_success 'merge c3 with c7 with --squash commit.cleanup = scissors' '
272 git config commit.cleanup scissors &&
273 git reset --hard c3 &&
274 test_must_fail git merge --squash c7 &&
275 cat result.9z >file &&
276 git commit --no-edit -a &&
277
278 cat >expect <<-EOF &&
279 Squashed commit of the following:
280
281 $(git show -s c7)
282
283 # ------------------------ >8 ------------------------
284 # Do not modify or remove the line above.
285 # Everything below it will be ignored.
286 #
287 # Conflicts:
288 # file
289 EOF
290 git cat-file commit HEAD >raw &&
291 sed -e '1,/^$/d' raw >actual &&
292 test_i18ncmp expect actual
293'
294
df516fb5 295test_debug 'git log --graph --decorate --oneline --all'
a85d1b69
LH
296
297test_expect_success 'merge c1 with c2 and c3' '
298 git reset --hard c1 &&
299 test_tick &&
300 git merge c2 c3 &&
301 verify_merge file result.1-5-9 msg.1-5-9 &&
302 verify_parents $c1 $c2 $c3
303'
304
df516fb5 305test_debug 'git log --graph --decorate --oneline --all'
a85d1b69 306
f23e8dec 307test_expect_success 'merges with --ff-only' '
13474835
BG
308 git reset --hard c1 &&
309 test_tick &&
310 test_must_fail git merge --ff-only c2 &&
311 test_must_fail git merge --ff-only c3 &&
f23e8dec
JH
312 test_must_fail git merge --ff-only c2 c3 &&
313 git reset --hard c0 &&
314 git merge c3 &&
315 verify_head $c3
316'
317
318test_expect_success 'merges with merge.ff=only' '
319 git reset --hard c1 &&
320 test_tick &&
cee683b7 321 test_config merge.ff "only" &&
f23e8dec
JH
322 test_must_fail git merge c2 &&
323 test_must_fail git merge c3 &&
324 test_must_fail git merge c2 c3 &&
325 git reset --hard c0 &&
326 git merge c3 &&
327 verify_head $c3
13474835
BG
328'
329
a85d1b69
LH
330test_expect_success 'merge c0 with c1 (no-commit)' '
331 git reset --hard c0 &&
332 git merge --no-commit c1 &&
333 verify_merge file result.1 &&
334 verify_head $c1
335'
336
df516fb5 337test_debug 'git log --graph --decorate --oneline --all'
a85d1b69
LH
338
339test_expect_success 'merge c1 with c2 (no-commit)' '
340 git reset --hard c1 &&
341 git merge --no-commit c2 &&
342 verify_merge file result.1-5 &&
343 verify_head $c1 &&
344 verify_mergeheads $c2
345'
346
df516fb5 347test_debug 'git log --graph --decorate --oneline --all'
a85d1b69
LH
348
349test_expect_success 'merge c1 with c2 and c3 (no-commit)' '
350 git reset --hard c1 &&
351 git merge --no-commit c2 c3 &&
352 verify_merge file result.1-5-9 &&
353 verify_head $c1 &&
354 verify_mergeheads $c2 $c3
355'
356
df516fb5 357test_debug 'git log --graph --decorate --oneline --all'
a85d1b69
LH
358
359test_expect_success 'merge c0 with c1 (squash)' '
360 git reset --hard c0 &&
361 git merge --squash c1 &&
362 verify_merge file result.1 &&
363 verify_head $c0 &&
364 verify_no_mergehead &&
4c073457 365 test_cmp squash.1 .git/SQUASH_MSG
a85d1b69
LH
366'
367
df516fb5 368test_debug 'git log --graph --decorate --oneline --all'
a85d1b69 369
13474835
BG
370test_expect_success 'merge c0 with c1 (squash, ff-only)' '
371 git reset --hard c0 &&
372 git merge --squash --ff-only c1 &&
373 verify_merge file result.1 &&
374 verify_head $c0 &&
375 verify_no_mergehead &&
4c073457 376 test_cmp squash.1 .git/SQUASH_MSG
13474835
BG
377'
378
df516fb5 379test_debug 'git log --graph --decorate --oneline --all'
13474835 380
a85d1b69
LH
381test_expect_success 'merge c1 with c2 (squash)' '
382 git reset --hard c1 &&
383 git merge --squash c2 &&
384 verify_merge file result.1-5 &&
385 verify_head $c1 &&
386 verify_no_mergehead &&
4c073457 387 test_cmp squash.1-5 .git/SQUASH_MSG
a85d1b69
LH
388'
389
df516fb5 390test_debug 'git log --graph --decorate --oneline --all'
a85d1b69 391
f7e604ed 392test_expect_success 'unsuccessful merge of c1 with c2 (squash, ff-only)' '
13474835
BG
393 git reset --hard c1 &&
394 test_must_fail git merge --squash --ff-only c2
395'
396
df516fb5 397test_debug 'git log --graph --decorate --oneline --all'
13474835 398
a85d1b69
LH
399test_expect_success 'merge c1 with c2 and c3 (squash)' '
400 git reset --hard c1 &&
401 git merge --squash c2 c3 &&
402 verify_merge file result.1-5-9 &&
403 verify_head $c1 &&
404 verify_no_mergehead &&
4c073457 405 test_cmp squash.1-5-9 .git/SQUASH_MSG
a85d1b69
LH
406'
407
df516fb5 408test_debug 'git log --graph --decorate --oneline --all'
a85d1b69 409
aec7b362
LH
410test_expect_success 'merge c1 with c2 (no-commit in config)' '
411 git reset --hard c1 &&
cee683b7 412 test_config branch.master.mergeoptions "--no-commit" &&
aec7b362
LH
413 git merge c2 &&
414 verify_merge file result.1-5 &&
415 verify_head $c1 &&
416 verify_mergeheads $c2
417'
418
df516fb5 419test_debug 'git log --graph --decorate --oneline --all'
aec7b362 420
0d8fc3ef 421test_expect_success 'merge c1 with c2 (log in config)' '
0d8fc3ef
JH
422 git reset --hard c1 &&
423 git merge --log c2 &&
424 git show -s --pretty=tformat:%s%n%b >expect &&
425
cee683b7 426 test_config branch.master.mergeoptions "--log" &&
0d8fc3ef
JH
427 git reset --hard c1 &&
428 git merge c2 &&
429 git show -s --pretty=tformat:%s%n%b >actual &&
430
431 test_cmp expect actual
432'
433
434test_expect_success 'merge c1 with c2 (log in config gets overridden)' '
0d8fc3ef
JH
435 git reset --hard c1 &&
436 git merge c2 &&
437 git show -s --pretty=tformat:%s%n%b >expect &&
438
cee683b7
YD
439 test_config branch.master.mergeoptions "--no-log" &&
440 test_config merge.log "true" &&
0d8fc3ef
JH
441 git reset --hard c1 &&
442 git merge c2 &&
443 git show -s --pretty=tformat:%s%n%b >actual &&
444
445 test_cmp expect actual
446'
447
aec7b362
LH
448test_expect_success 'merge c1 with c2 (squash in config)' '
449 git reset --hard c1 &&
cee683b7 450 test_config branch.master.mergeoptions "--squash" &&
aec7b362
LH
451 git merge c2 &&
452 verify_merge file result.1-5 &&
453 verify_head $c1 &&
454 verify_no_mergehead &&
4c073457 455 test_cmp squash.1-5 .git/SQUASH_MSG
aec7b362
LH
456'
457
df516fb5 458test_debug 'git log --graph --decorate --oneline --all'
aec7b362 459
d8abe148 460test_expect_success 'override config option -n with --summary' '
aec7b362 461 git reset --hard c1 &&
cee683b7 462 test_config branch.master.mergeoptions "-n" &&
aec7b362
LH
463 test_tick &&
464 git merge --summary c2 >diffstat.txt &&
465 verify_merge file result.1-5 msg.1-5 &&
466 verify_parents $c1 $c2 &&
aadbe44f 467 if ! grep "^ file | *2 +-$" diffstat.txt
aec7b362 468 then
d8abe148
SG
469 echo "[OOPS] diffstat was not generated with --summary"
470 false
471 fi
472'
473
474test_expect_success 'override config option -n with --stat' '
475 git reset --hard c1 &&
cee683b7 476 test_config branch.master.mergeoptions "-n" &&
d8abe148
SG
477 test_tick &&
478 git merge --stat c2 >diffstat.txt &&
479 verify_merge file result.1-5 msg.1-5 &&
480 verify_parents $c1 $c2 &&
481 if ! grep "^ file | *2 +-$" diffstat.txt
482 then
483 echo "[OOPS] diffstat was not generated with --stat"
484 false
aec7b362
LH
485 fi
486'
487
df516fb5 488test_debug 'git log --graph --decorate --oneline --all'
aec7b362 489
d8abe148 490test_expect_success 'override config option --stat' '
aec7b362 491 git reset --hard c1 &&
cee683b7 492 test_config branch.master.mergeoptions "--stat" &&
aec7b362
LH
493 test_tick &&
494 git merge -n c2 >diffstat.txt &&
495 verify_merge file result.1-5 msg.1-5 &&
496 verify_parents $c1 $c2 &&
aadbe44f 497 if grep "^ file | *2 +-$" diffstat.txt
aec7b362
LH
498 then
499 echo "[OOPS] diffstat was generated"
500 false
501 fi
502'
503
df516fb5 504test_debug 'git log --graph --decorate --oneline --all'
aec7b362 505
d08af0ad
LH
506test_expect_success 'merge c1 with c2 (override --no-commit)' '
507 git reset --hard c1 &&
cee683b7 508 test_config branch.master.mergeoptions "--no-commit" &&
d08af0ad
LH
509 test_tick &&
510 git merge --commit c2 &&
511 verify_merge file result.1-5 msg.1-5 &&
512 verify_parents $c1 $c2
513'
514
df516fb5 515test_debug 'git log --graph --decorate --oneline --all'
d08af0ad
LH
516
517test_expect_success 'merge c1 with c2 (override --squash)' '
518 git reset --hard c1 &&
cee683b7 519 test_config branch.master.mergeoptions "--squash" &&
d08af0ad
LH
520 test_tick &&
521 git merge --no-squash c2 &&
522 verify_merge file result.1-5 msg.1-5 &&
523 verify_parents $c1 $c2
524'
525
df516fb5 526test_debug 'git log --graph --decorate --oneline --all'
d08af0ad 527
d66424c4
LH
528test_expect_success 'merge c0 with c1 (no-ff)' '
529 git reset --hard c0 &&
530 test_tick &&
531 git merge --no-ff c1 &&
532 verify_merge file result.1 &&
533 verify_parents $c0 $c1
534'
535
df516fb5 536test_debug 'git log --graph --decorate --oneline --all'
d66424c4 537
f23e8dec
JH
538test_expect_success 'merge c0 with c1 (merge.ff=false)' '
539 git reset --hard c0 &&
cee683b7 540 test_config merge.ff "false" &&
f23e8dec
JH
541 test_tick &&
542 git merge c1 &&
f23e8dec
JH
543 verify_merge file result.1 &&
544 verify_parents $c0 $c1
545'
546test_debug 'git log --graph --decorate --oneline --all'
547
548test_expect_success 'combine branch.master.mergeoptions with merge.ff' '
549 git reset --hard c0 &&
cee683b7
YD
550 test_config branch.master.mergeoptions "--ff" &&
551 test_config merge.ff "false" &&
f23e8dec
JH
552 test_tick &&
553 git merge c1 &&
f23e8dec
JH
554 verify_merge file result.1 &&
555 verify_parents "$c0"
556'
557
8c5cea00
JN
558test_expect_success 'tolerate unknown values for merge.ff' '
559 git reset --hard c0 &&
cee683b7 560 test_config merge.ff "something-new" &&
8c5cea00
JN
561 test_tick &&
562 git merge c1 2>message &&
8c5cea00 563 verify_head "$c1" &&
1c5e94f4 564 test_must_be_empty message
8c5cea00
JN
565'
566
e6d1f76c 567test_expect_success 'combining --squash and --no-ff is refused' '
8c5cea00 568 git reset --hard c0 &&
e6d1f76c
GP
569 test_must_fail git merge --squash --no-ff c1 &&
570 test_must_fail git merge --no-ff --squash c1
571'
572
1d14d0c9
VV
573test_expect_success 'combining --squash and --commit is refused' '
574 git reset --hard c0 &&
575 test_must_fail git merge --squash --commit c1 &&
576 test_must_fail git merge --commit --squash c1
577'
578
a54841e9
MV
579test_expect_success 'option --ff-only overwrites --no-ff' '
580 git merge --no-ff --ff-only c1 &&
581 test_must_fail git merge --no-ff --ff-only c2
582'
583
6d2d43dc 584test_expect_success 'option --no-ff overrides merge.ff=only config' '
a54841e9
MV
585 git reset --hard c0 &&
586 test_config merge.ff only &&
587 git merge --no-ff c1
13474835
BG
588'
589
d66424c4
LH
590test_expect_success 'merge c0 with c1 (ff overrides no-ff)' '
591 git reset --hard c0 &&
cee683b7 592 test_config branch.master.mergeoptions "--no-ff" &&
d66424c4
LH
593 git merge --ff c1 &&
594 verify_merge file result.1 &&
595 verify_head $c1
596'
597
efb779f8
SG
598test_expect_success 'merge log message' '
599 git reset --hard c0 &&
600 git merge --no-log c2 &&
601 git show -s --pretty=format:%b HEAD >msg.act &&
1c5e94f4 602 test_must_be_empty msg.act &&
cee683b7
YD
603
604 git reset --hard c0 &&
605 test_config branch.master.mergeoptions "--no-ff" &&
606 git merge --no-log c2 &&
607 git show -s --pretty=format:%b HEAD >msg.act &&
1c5e94f4 608 test_must_be_empty msg.act &&
4393c237 609
efb779f8
SG
610 git merge --log c3 &&
611 git show -s --pretty=format:%b HEAD >msg.act &&
4c073457 612 test_cmp msg.log msg.act &&
4393c237
JH
613
614 git reset --hard HEAD^ &&
cee683b7 615 test_config merge.log "yes" &&
4393c237
JH
616 git merge c3 &&
617 git show -s --pretty=format:%b HEAD >msg.act &&
4c073457 618 test_cmp msg.log msg.act
efb779f8
SG
619'
620
df516fb5 621test_debug 'git log --graph --decorate --oneline --all'
d66424c4 622
3d1dd472
SHJ
623test_expect_success 'merge c1 with c0, c2, c0, and c1' '
624 git reset --hard c1 &&
3d1dd472
SHJ
625 test_tick &&
626 git merge c0 c2 c0 c1 &&
627 verify_merge file result.1-5 &&
628 verify_parents $c1 $c2
629'
630
df516fb5 631test_debug 'git log --graph --decorate --oneline --all'
3d1dd472 632
711f6b29
JH
633test_expect_success 'merge c1 with c0, c2, c0, and c1' '
634 git reset --hard c1 &&
711f6b29
JH
635 test_tick &&
636 git merge c0 c2 c0 c1 &&
637 verify_merge file result.1-5 &&
638 verify_parents $c1 $c2
639'
640
df516fb5 641test_debug 'git log --graph --decorate --oneline --all'
711f6b29
JH
642
643test_expect_success 'merge c1 with c1 and c2' '
644 git reset --hard c1 &&
711f6b29
JH
645 test_tick &&
646 git merge c1 c2 &&
647 verify_merge file result.1-5 &&
648 verify_parents $c1 $c2
649'
650
df516fb5 651test_debug 'git log --graph --decorate --oneline --all'
711f6b29 652
9ca8f607
JH
653test_expect_success 'merge fast-forward in a dirty tree' '
654 git reset --hard c0 &&
655 mv file file1 &&
656 cat file1 >file &&
657 rm -f file1 &&
658 git merge c2
659'
660
df516fb5 661test_debug 'git log --graph --decorate --oneline --all'
9ca8f607 662
c9ea118e 663test_expect_success 'in-index merge' '
446247db 664 git reset --hard c0 &&
4c073457 665 git merge --no-ff -s resolve c1 >out &&
c9ea118e 666 test_i18ngrep "Wonderful." out &&
446247db
JH
667 verify_parents $c0 $c1
668'
669
df516fb5 670test_debug 'git log --graph --decorate --oneline --all'
446247db 671
668f26ff
MV
672test_expect_success 'refresh the index before merging' '
673 git reset --hard c1 &&
016e5ff2 674 cp file file.n && mv -f file.n file &&
668f26ff
MV
675 git merge c3
676'
677
b81f925f
JN
678cat >expected.branch <<\EOF
679Merge branch 'c5-branch' (early part)
680EOF
681cat >expected.tag <<\EOF
682Merge commit 'c5~1'
4e6d4bc0
MV
683EOF
684
685test_expect_success 'merge early part of c2' '
686 git reset --hard c3 &&
4c073457 687 echo c4 >c4.c &&
4e6d4bc0
MV
688 git add c4.c &&
689 git commit -m c4 &&
690 git tag c4 &&
4c073457 691 echo c5 >c5.c &&
4e6d4bc0
MV
692 git add c5.c &&
693 git commit -m c5 &&
694 git tag c5 &&
695 git reset --hard c3 &&
4c073457 696 echo c6 >c6.c &&
4e6d4bc0
MV
697 git add c6.c &&
698 git commit -m c6 &&
699 git tag c6 &&
b81f925f
JN
700 git branch -f c5-branch c5 &&
701 git merge c5-branch~1 &&
ad2f7255 702 git show -s --pretty=tformat:%s HEAD >actual.branch &&
b81f925f 703 git reset --keep HEAD^ &&
4e6d4bc0 704 git merge c5~1 &&
ad2f7255 705 git show -s --pretty=tformat:%s HEAD >actual.tag &&
b81f925f
JN
706 test_cmp expected.branch actual.branch &&
707 test_cmp expected.tag actual.tag
4e6d4bc0
MV
708'
709
df516fb5 710test_debug 'git log --graph --decorate --oneline --all'
668f26ff 711
cf10f9fd
MV
712test_expect_success 'merge --no-ff --no-commit && commit' '
713 git reset --hard c0 &&
714 git merge --no-ff --no-commit c1 &&
715 EDITOR=: git commit &&
716 verify_parents $c0 $c1
717'
718
df516fb5 719test_debug 'git log --graph --decorate --oneline --all'
cf10f9fd
MV
720
721test_expect_success 'amending no-ff merge commit' '
722 EDITOR=: git commit --amend &&
723 verify_parents $c0 $c1
724'
725
df516fb5 726test_debug 'git log --graph --decorate --oneline --all'
cf10f9fd 727
66f4b98a
JS
728cat >editor <<\EOF
729#!/bin/sh
730# Add a new message string that was not in the template
731(
732 echo "Merge work done on the side branch c1"
733 echo
b510f0be 734 cat "$1"
66f4b98a
JS
735) >"$1.tmp" && mv "$1.tmp" "$1"
736# strip comments and blank lines from end of message
b510f0be 737sed -e '/^#/d' "$1" | sed -e :a -e '/^\n*$/{$d;N;ba' -e '}' >expected
66f4b98a
JS
738EOF
739chmod 755 editor
740
741test_expect_success 'merge --no-ff --edit' '
742 git reset --hard c0 &&
743 EDITOR=./editor git merge --no-ff --edit c1 &&
744 verify_parents $c0 $c1 &&
745 git cat-file commit HEAD >raw &&
746 grep "work done on the side branch" raw &&
747 sed "1,/^$/d" >actual raw &&
9c5b2fab 748 test_cmp expected actual
66f4b98a
JS
749'
750
adcc94a0
JH
751test_expect_success 'merge annotated/signed tag w/o tracking' '
752 test_when_finished "rm -rf dst; git tag -d anno1" &&
753 git tag -a -m "anno c1" anno1 c1 &&
754 git init dst &&
755 git rev-parse c1 >dst/expect &&
756 (
757 # c0 fast-forwards to c1 but because this repository
758 # is not a "downstream" whose refs/tags follows along
759 # tag from the "upstream", this pull defaults to --no-ff
760 cd dst &&
761 git pull .. c0 &&
762 git pull .. anno1 &&
763 git rev-parse HEAD^2 >actual &&
764 test_cmp expect actual
765 )
766'
767
768test_expect_success 'merge annotated/signed tag w/ tracking' '
769 test_when_finished "rm -rf dst; git tag -d anno1" &&
770 git tag -a -m "anno c1" anno1 c1 &&
771 git init dst &&
772 git rev-parse c1 >dst/expect &&
773 (
774 # c0 fast-forwards to c1 and because this repository
775 # is a "downstream" whose refs/tags follows along
776 # tag from the "upstream", this pull defaults to --ff
777 cd dst &&
778 git remote add origin .. &&
779 git pull origin c0 &&
780 git fetch origin &&
781 git merge anno1 &&
782 git rev-parse HEAD >actual &&
783 test_cmp expect actual
784 )
785'
786
b5c9f1c1
JH
787test_expect_success GPG 'merge --ff-only tag' '
788 git reset --hard c0 &&
789 git commit --allow-empty -m "A newer commit" &&
790 git tag -s -m "A newer commit" signed &&
791 git reset --hard c0 &&
792
793 git merge --ff-only signed &&
794 git rev-parse signed^0 >expect &&
795 git rev-parse HEAD >actual &&
9c5b2fab 796 test_cmp expect actual
b5c9f1c1
JH
797'
798
3adab6f3
JH
799test_expect_success GPG 'merge --no-edit tag should skip editor' '
800 git reset --hard c0 &&
801 git commit --allow-empty -m "A newer commit" &&
802 git tag -f -s -m "A newer commit" signed &&
803 git reset --hard c0 &&
804
adcc94a0 805 EDITOR=false git merge --no-edit --no-ff signed &&
3adab6f3
JH
806 git rev-parse signed^0 >expect &&
807 git rev-parse HEAD^2 >actual &&
9c5b2fab 808 test_cmp expect actual
3adab6f3
JH
809'
810
e34f8027
JK
811test_expect_success 'set up mod-256 conflict scenario' '
812 # 256 near-identical stanzas...
813 for i in $(test_seq 1 256); do
814 for j in 1 2 3 4 5; do
815 echo $i-$j
816 done
817 done >file &&
818 git add file &&
819 git commit -m base &&
820
821 # one side changes the first line of each to "master"
b510f0be 822 sed s/-1/-master/ file >tmp &&
e34f8027
JK
823 mv tmp file &&
824 git commit -am master &&
825
826 # and the other to "side"; merging the two will
827 # yield 256 separate conflicts
828 git checkout -b side HEAD^ &&
b510f0be 829 sed s/-1/-side/ file >tmp &&
e34f8027
JK
830 mv tmp file &&
831 git commit -am side
832'
833
834test_expect_success 'merge detects mod-256 conflicts (recursive)' '
835 git reset --hard &&
836 test_must_fail git merge -s recursive master
837'
838
839test_expect_success 'merge detects mod-256 conflicts (resolve)' '
840 git reset --hard &&
841 test_must_fail git merge -s resolve master
842'
843
b84e65d4
JH
844test_expect_success 'merge nothing into void' '
845 git init void &&
846 (
847 cd void &&
848 git remote add up .. &&
849 git fetch up &&
850 test_must_fail git merge FETCH_HEAD
851 )
852'
853
367ff694
CP
854test_expect_success 'merge can be completed with --continue' '
855 git reset --hard c0 &&
856 git merge --no-ff --no-commit c1 &&
857 git merge --continue &&
858 verify_parents $c0 $c1
859'
860
9d89b355
MG
861write_script .git/FAKE_EDITOR <<EOF
862# kill -TERM command added below.
863EOF
864
865test_expect_success EXECKEEPSPID 'killed merge can be completed with --continue' '
866 git reset --hard c0 &&
867 ! "$SHELL_PATH" -c '\''
b510f0be 868 echo kill -TERM $$ >>.git/FAKE_EDITOR
9d89b355
MG
869 GIT_EDITOR=.git/FAKE_EDITOR
870 export GIT_EDITOR
871 exec git merge --no-ff --edit c1'\'' &&
872 git merge --continue &&
873 verify_parents $c0 $c1
874'
875
f3f8311e
NTND
876test_expect_success 'merge --quit' '
877 git init merge-quit &&
878 (
879 cd merge-quit &&
880 test_commit base &&
881 echo one >>base.t &&
882 git commit -am one &&
883 git branch one &&
884 git checkout base &&
885 echo two >>base.t &&
886 git commit -am two &&
887 test_must_fail git -c rerere.enabled=true merge one &&
888 test_path_is_file .git/MERGE_HEAD &&
889 test_path_is_file .git/MERGE_MODE &&
890 test_path_is_file .git/MERGE_MSG &&
891 git rerere status >rerere.before &&
892 git merge --quit &&
893 test_path_is_missing .git/MERGE_HEAD &&
894 test_path_is_missing .git/MERGE_MODE &&
895 test_path_is_missing .git/MERGE_MSG &&
896 git rerere status >rerere.after &&
897 test_must_be_empty rerere.after &&
898 ! test_cmp rerere.after rerere.before
899 )
900'
901
8ed51b06
JK
902test_expect_success 'merge suggests matching remote refname' '
903 git commit --allow-empty -m not-local &&
904 git update-ref refs/remotes/origin/not-local HEAD &&
905 git reset --hard HEAD^ &&
906
907 # This is white-box testing hackery; we happen to know
908 # that reading packed refs is more picky about the memory
909 # ownership of strings we pass to for_each_ref() callbacks.
910 git pack-refs --all --prune &&
911
912 test_must_fail git merge not-local 2>stderr &&
913 grep origin/not-local stderr
914'
915
2ed2e199
JK
916test_expect_success 'suggested names are not ambiguous' '
917 git update-ref refs/heads/origin/not-local HEAD &&
918 test_must_fail git merge not-local 2>stderr &&
919 grep remotes/origin/not-local stderr
920'
921
a85d1b69 922test_done