1 #!/bin/sh
2 #
3 # Copyright (c) 2007 Lars Hjemli
4 #
6 test_description='git merge
8 Testing basic merge operations/option parsing.
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 '
29 . ./test-lib.sh
31 test_expect_success 'set up test data and helpers' '
32 printf "%s\n" 1 2 3 4 5 6 7 8 9 >file &&
33 printf "%s\n" "1 X" 2 3 4 5 6 7 8 9 >file.1 &&
34 printf "%s\n" 1 2 3 4 "5 X" 6 7 8 9 >file.5 &&
35 printf "%s\n" 1 2 3 4 5 6 7 8 "9 X" >file.9 &&
36 printf "%s\n" "1 X" 2 3 4 5 6 7 8 9 >result.1 &&
37 printf "%s\n" "1 X" 2 3 4 "5 X" 6 7 8 9 >result.1-5 &&
38 printf "%s\n" "1 X" 2 3 4 "5 X" 6 7 8 "9 X" >result.1-5-9 &&
40 create_merge_msgs() {
41 echo "Merge commit '\''c2'\''" >msg.1-5 &&
42 echo "Merge commit '\''c2'\''; commit '\''c3'\''" >msg.1-5-9 &&
43 {
44 echo "Squashed commit of the following:" &&
45 echo &&
46 git log --no-merges ^HEAD c1
47 } >squash.1 &&
48 {
49 echo "Squashed commit of the following:" &&
50 echo &&
51 git log --no-merges ^HEAD c2
52 } >squash.1-5 &&
53 {
54 echo "Squashed commit of the following:" &&
55 echo &&
56 git log --no-merges ^HEAD c2 c3
57 } >squash.1-5-9 &&
58 echo >msg.nolog &&
59 {
60 echo "* commit '\''c3'\'':" &&
61 echo " commit 3" &&
62 echo
63 } >msg.log
64 } &&
66 verify_merge() {
67 test_cmp "$2" "$1" &&
68 git update-index --refresh &&
69 git diff --exit-code &&
70 if test -n "$3"
71 then
72 git show -s --pretty=format:%s HEAD >msg.act &&
73 test_cmp "$3" msg.act
74 fi
75 } &&
77 verify_head() {
78 echo "$1" >head.expected &&
79 git rev-parse HEAD >head.actual &&
80 test_cmp head.expected head.actual
81 } &&
83 verify_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 &&
93 test_cmp parents.expected parents.actual
94 } &&
96 verify_mergeheads() {
97 printf "%s\n" "$@" >mergehead.expected &&
98 test_cmp mergehead.expected .git/MERGE_HEAD
99 } &&
101 verify_no_mergehead() {
102 ! test -e .git/MERGE_HEAD
103 }
104 '
106 test_expect_success 'setup' '
107 git add file &&
108 test_tick &&
109 git commit -m "commit 0" &&
110 git tag c0 &&
111 c0=$(git rev-parse HEAD) &&
112 cp file.1 file &&
113 git add file &&
114 test_tick &&
115 git commit -m "commit 1" &&
116 git tag c1 &&
117 c1=$(git rev-parse HEAD) &&
118 git reset --hard "$c0" &&
119 cp file.5 file &&
120 git add file &&
121 test_tick &&
122 git commit -m "commit 2" &&
123 git tag c2 &&
124 c2=$(git rev-parse HEAD) &&
125 git reset --hard "$c0" &&
126 cp file.9 file &&
127 git add file &&
128 test_tick &&
129 git commit -m "commit 3" &&
130 git tag c3 &&
131 c3=$(git rev-parse HEAD)
132 git reset --hard "$c0" &&
133 create_merge_msgs
134 '
136 test_debug 'git log --graph --decorate --oneline --all'
138 test_expect_success 'test option parsing' '
139 test_must_fail git merge -$ c1 &&
140 test_must_fail git merge --no-such c1 &&
141 test_must_fail git merge -s foobar c1 &&
142 test_must_fail git merge -s=foobar c1 &&
143 test_must_fail git merge -m &&
144 test_must_fail git merge
145 '
147 test_expect_success 'reject non-strategy with a git-merge-foo name' '
148 test_must_fail git merge -s index c1
149 '
151 test_expect_success 'merge c0 with c1' '
152 echo "OBJID HEAD@{0}: merge c1: Fast-forward" >reflog.expected &&
154 git reset --hard c0 &&
155 git merge c1 &&
156 verify_merge file result.1 &&
157 verify_head "$c1" &&
159 git reflog -1 >reflog.actual &&
160 sed "s/$_x05[0-9a-f]*/OBJID/g" reflog.actual >reflog.fuzzy &&
161 test_cmp reflog.expected reflog.fuzzy
162 '
164 test_debug 'git log --graph --decorate --oneline --all'
166 test_expect_success 'merge c0 with c1 with --ff-only' '
167 git reset --hard c0 &&
168 git merge --ff-only c1 &&
169 git merge --ff-only HEAD c0 c1 &&
170 verify_merge file result.1 &&
171 verify_head "$c1"
172 '
174 test_debug 'git log --graph --decorate --oneline --all'
176 test_expect_success 'merge c1 with c2' '
177 git reset --hard c1 &&
178 test_tick &&
179 git merge c2 &&
180 verify_merge file result.1-5 msg.1-5 &&
181 verify_parents $c1 $c2
182 '
184 test_debug 'git log --graph --decorate --oneline --all'
186 test_expect_success 'merge c1 with c2 and c3' '
187 git reset --hard c1 &&
188 test_tick &&
189 git merge c2 c3 &&
190 verify_merge file result.1-5-9 msg.1-5-9 &&
191 verify_parents $c1 $c2 $c3
192 '
194 test_debug 'git log --graph --decorate --oneline --all'
196 test_expect_success 'failing merges with --ff-only' '
197 git reset --hard c1 &&
198 test_tick &&
199 test_must_fail git merge --ff-only c2 &&
200 test_must_fail git merge --ff-only c3 &&
201 test_must_fail git merge --ff-only c2 c3
202 '
204 test_expect_success 'merge c0 with c1 (no-commit)' '
205 git reset --hard c0 &&
206 git merge --no-commit c1 &&
207 verify_merge file result.1 &&
208 verify_head $c1
209 '
211 test_debug 'git log --graph --decorate --oneline --all'
213 test_expect_success 'merge c1 with c2 (no-commit)' '
214 git reset --hard c1 &&
215 git merge --no-commit c2 &&
216 verify_merge file result.1-5 &&
217 verify_head $c1 &&
218 verify_mergeheads $c2
219 '
221 test_debug 'git log --graph --decorate --oneline --all'
223 test_expect_success 'merge c1 with c2 and c3 (no-commit)' '
224 git reset --hard c1 &&
225 git merge --no-commit c2 c3 &&
226 verify_merge file result.1-5-9 &&
227 verify_head $c1 &&
228 verify_mergeheads $c2 $c3
229 '
231 test_debug 'git log --graph --decorate --oneline --all'
233 test_expect_success 'merge c0 with c1 (squash)' '
234 git reset --hard c0 &&
235 git merge --squash c1 &&
236 verify_merge file result.1 &&
237 verify_head $c0 &&
238 verify_no_mergehead &&
239 test_cmp squash.1 .git/SQUASH_MSG
240 '
242 test_debug 'git log --graph --decorate --oneline --all'
244 test_expect_success 'merge c0 with c1 (squash, ff-only)' '
245 git reset --hard c0 &&
246 git merge --squash --ff-only c1 &&
247 verify_merge file result.1 &&
248 verify_head $c0 &&
249 verify_no_mergehead &&
250 test_cmp squash.1 .git/SQUASH_MSG
251 '
253 test_debug 'git log --graph --decorate --oneline --all'
255 test_expect_success 'merge c1 with c2 (squash)' '
256 git reset --hard c1 &&
257 git merge --squash c2 &&
258 verify_merge file result.1-5 &&
259 verify_head $c1 &&
260 verify_no_mergehead &&
261 test_cmp squash.1-5 .git/SQUASH_MSG
262 '
264 test_debug 'git log --graph --decorate --oneline --all'
266 test_expect_success 'unsuccesful merge of c1 with c2 (squash, ff-only)' '
267 git reset --hard c1 &&
268 test_must_fail git merge --squash --ff-only c2
269 '
271 test_debug 'git log --graph --decorate --oneline --all'
273 test_expect_success 'merge c1 with c2 and c3 (squash)' '
274 git reset --hard c1 &&
275 git merge --squash c2 c3 &&
276 verify_merge file result.1-5-9 &&
277 verify_head $c1 &&
278 verify_no_mergehead &&
279 test_cmp squash.1-5-9 .git/SQUASH_MSG
280 '
282 test_debug 'git log --graph --decorate --oneline --all'
284 test_expect_success 'merge c1 with c2 (no-commit in config)' '
285 git reset --hard c1 &&
286 git config branch.master.mergeoptions "--no-commit" &&
287 git merge c2 &&
288 verify_merge file result.1-5 &&
289 verify_head $c1 &&
290 verify_mergeheads $c2
291 '
293 test_debug 'git log --graph --decorate --oneline --all'
295 test_expect_success 'merge c1 with c2 (squash in config)' '
296 git reset --hard c1 &&
297 git config branch.master.mergeoptions "--squash" &&
298 git merge c2 &&
299 verify_merge file result.1-5 &&
300 verify_head $c1 &&
301 verify_no_mergehead &&
302 test_cmp squash.1-5 .git/SQUASH_MSG
303 '
305 test_debug 'git log --graph --decorate --oneline --all'
307 test_expect_success 'override config option -n with --summary' '
308 git reset --hard c1 &&
309 git config branch.master.mergeoptions "-n" &&
310 test_tick &&
311 git merge --summary c2 >diffstat.txt &&
312 verify_merge file result.1-5 msg.1-5 &&
313 verify_parents $c1 $c2 &&
314 if ! grep "^ file | *2 +-$" diffstat.txt
315 then
316 echo "[OOPS] diffstat was not generated with --summary"
317 false
318 fi
319 '
321 test_expect_success 'override config option -n with --stat' '
322 git reset --hard c1 &&
323 git config branch.master.mergeoptions "-n" &&
324 test_tick &&
325 git merge --stat c2 >diffstat.txt &&
326 verify_merge file result.1-5 msg.1-5 &&
327 verify_parents $c1 $c2 &&
328 if ! grep "^ file | *2 +-$" diffstat.txt
329 then
330 echo "[OOPS] diffstat was not generated with --stat"
331 false
332 fi
333 '
335 test_debug 'git log --graph --decorate --oneline --all'
337 test_expect_success 'override config option --stat' '
338 git reset --hard c1 &&
339 git config branch.master.mergeoptions "--stat" &&
340 test_tick &&
341 git merge -n c2 >diffstat.txt &&
342 verify_merge file result.1-5 msg.1-5 &&
343 verify_parents $c1 $c2 &&
344 if grep "^ file | *2 +-$" diffstat.txt
345 then
346 echo "[OOPS] diffstat was generated"
347 false
348 fi
349 '
351 test_debug 'git log --graph --decorate --oneline --all'
353 test_expect_success 'merge c1 with c2 (override --no-commit)' '
354 git reset --hard c1 &&
355 git config branch.master.mergeoptions "--no-commit" &&
356 test_tick &&
357 git merge --commit c2 &&
358 verify_merge file result.1-5 msg.1-5 &&
359 verify_parents $c1 $c2
360 '
362 test_debug 'git log --graph --decorate --oneline --all'
364 test_expect_success 'merge c1 with c2 (override --squash)' '
365 git reset --hard c1 &&
366 git config branch.master.mergeoptions "--squash" &&
367 test_tick &&
368 git merge --no-squash c2 &&
369 verify_merge file result.1-5 msg.1-5 &&
370 verify_parents $c1 $c2
371 '
373 test_debug 'git log --graph --decorate --oneline --all'
375 test_expect_success 'merge c0 with c1 (no-ff)' '
376 git reset --hard c0 &&
377 git config branch.master.mergeoptions "" &&
378 test_tick &&
379 git merge --no-ff c1 &&
380 verify_merge file result.1 &&
381 verify_parents $c0 $c1
382 '
384 test_debug 'git log --graph --decorate --oneline --all'
386 test_expect_success 'combining --squash and --no-ff is refused' '
387 test_must_fail git merge --squash --no-ff c1 &&
388 test_must_fail git merge --no-ff --squash c1
389 '
391 test_expect_success 'combining --ff-only and --no-ff is refused' '
392 test_must_fail git merge --ff-only --no-ff c1 &&
393 test_must_fail git merge --no-ff --ff-only c1
394 '
396 test_expect_success 'merge c0 with c1 (ff overrides no-ff)' '
397 git reset --hard c0 &&
398 git config branch.master.mergeoptions "--no-ff" &&
399 git merge --ff c1 &&
400 verify_merge file result.1 &&
401 verify_head $c1
402 '
404 test_expect_success 'merge log message' '
405 git reset --hard c0 &&
406 git merge --no-log c2 &&
407 git show -s --pretty=format:%b HEAD >msg.act &&
408 test_cmp msg.nolog msg.act &&
410 git merge --log c3 &&
411 git show -s --pretty=format:%b HEAD >msg.act &&
412 test_cmp msg.log msg.act &&
414 git reset --hard HEAD^ &&
415 git config merge.log yes &&
416 git merge c3 &&
417 git show -s --pretty=format:%b HEAD >msg.act &&
418 test_cmp msg.log msg.act
419 '
421 test_debug 'git log --graph --decorate --oneline --all'
423 test_expect_success 'merge c1 with c0, c2, c0, and c1' '
424 git reset --hard c1 &&
425 git config branch.master.mergeoptions "" &&
426 test_tick &&
427 git merge c0 c2 c0 c1 &&
428 verify_merge file result.1-5 &&
429 verify_parents $c1 $c2
430 '
432 test_debug 'git log --graph --decorate --oneline --all'
434 test_expect_success 'merge c1 with c0, c2, c0, and c1' '
435 git reset --hard c1 &&
436 git config branch.master.mergeoptions "" &&
437 test_tick &&
438 git merge c0 c2 c0 c1 &&
439 verify_merge file result.1-5 &&
440 verify_parents $c1 $c2
441 '
443 test_debug 'git log --graph --decorate --oneline --all'
445 test_expect_success 'merge c1 with c1 and c2' '
446 git reset --hard c1 &&
447 git config branch.master.mergeoptions "" &&
448 test_tick &&
449 git merge c1 c2 &&
450 verify_merge file result.1-5 &&
451 verify_parents $c1 $c2
452 '
454 test_debug 'git log --graph --decorate --oneline --all'
456 test_expect_success 'merge fast-forward in a dirty tree' '
457 git reset --hard c0 &&
458 mv file file1 &&
459 cat file1 >file &&
460 rm -f file1 &&
461 git merge c2
462 '
464 test_debug 'git log --graph --decorate --oneline --all'
466 test_expect_success 'in-index merge' '
467 git reset --hard c0 &&
468 git merge --no-ff -s resolve c1 >out &&
469 grep "Wonderful." out &&
470 verify_parents $c0 $c1
471 '
473 test_debug 'git log --graph --decorate --oneline --all'
475 test_expect_success 'refresh the index before merging' '
476 git reset --hard c1 &&
477 cp file file.n && mv -f file.n file &&
478 git merge c3
479 '
481 cat >expected.branch <<\EOF
482 Merge branch 'c5-branch' (early part)
483 EOF
484 cat >expected.tag <<\EOF
485 Merge commit 'c5~1'
486 EOF
488 test_expect_success 'merge early part of c2' '
489 git reset --hard c3 &&
490 echo c4 >c4.c &&
491 git add c4.c &&
492 git commit -m c4 &&
493 git tag c4 &&
494 echo c5 >c5.c &&
495 git add c5.c &&
496 git commit -m c5 &&
497 git tag c5 &&
498 git reset --hard c3 &&
499 echo c6 >c6.c &&
500 git add c6.c &&
501 git commit -m c6 &&
502 git tag c6 &&
503 git branch -f c5-branch c5 &&
504 git merge c5-branch~1 &&
505 git show -s --pretty=format:%s HEAD >actual.branch &&
506 git reset --keep HEAD^ &&
507 git merge c5~1 &&
508 git show -s --pretty=format:%s HEAD >actual.tag &&
509 test_cmp expected.branch actual.branch &&
510 test_cmp expected.tag actual.tag
511 '
513 test_debug 'git log --graph --decorate --oneline --all'
515 test_expect_success 'merge --no-ff --no-commit && commit' '
516 git reset --hard c0 &&
517 git merge --no-ff --no-commit c1 &&
518 EDITOR=: git commit &&
519 verify_parents $c0 $c1
520 '
522 test_debug 'git log --graph --decorate --oneline --all'
524 test_expect_success 'amending no-ff merge commit' '
525 EDITOR=: git commit --amend &&
526 verify_parents $c0 $c1
527 '
529 test_debug 'git log --graph --decorate --oneline --all'
531 test_done