op public repos

Blob

Date:: Mon Apr 17 15:53:19 2023 UTC
Message:: allow no-op merge commits to be created Requested by James Cook
Actions:: History | Blame | Raw File
1 #!/bin/sh
2 #
3 # Copyright (c) 2021 Stefan Sperling <stsp@openbsd.org>
4 #
5 # Permission to use, copy, modify, and distribute this software for any
6 # purpose with or without fee is hereby granted, provided that the above
7 # copyright notice and this permission notice appear in all copies.
8 #
9 # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 
17 . ./common.sh
18 
19 test_merge_basic() {
20 	local testroot=`test_init merge_basic`
21 	local commit0=`git_show_head $testroot/repo`
22 	local commit0_author_time=`git_show_author_time $testroot/repo`
23 
24 	(cd $testroot/repo && git checkout -q -b newbranch)
25 	echo "modified delta on branch" > $testroot/repo/gamma/delta
26 	git_commit $testroot/repo -m "committing to delta on newbranch"
27 	local branch_commit0=`git_show_branch_head $testroot/repo newbranch`
28 
29 	echo "modified alpha on branch" > $testroot/repo/alpha
30 	git_commit $testroot/repo -m "committing to alpha on newbranch"
31 	local branch_commit1=`git_show_branch_head $testroot/repo newbranch`
32 	(cd $testroot/repo && git rm -q beta)
33 	git_commit $testroot/repo -m "removing beta on newbranch"
34 	local branch_commit2=`git_show_branch_head $testroot/repo newbranch`
35 	echo "new file on branch" > $testroot/repo/epsilon/new
36 	(cd $testroot/repo && git add epsilon/new)
37 	git_commit $testroot/repo -m "adding new file on newbranch"
38 	local branch_commit3=`git_show_branch_head $testroot/repo newbranch`
39 	(cd $testroot/repo && ln -s alpha symlink && git add symlink)
40 	git_commit $testroot/repo -m "adding symlink on newbranch"
41 	local branch_commit4=`git_show_branch_head $testroot/repo newbranch`
42 	(cd $testroot/repo && ln -sf .got/bar dotgotbar.link)
43 	(cd $testroot/repo && git add dotgotbar.link)
44 	git_commit $testroot/repo -m "adding a bad symlink on newbranch"
45 	local branch_commit5=`git_show_branch_head $testroot/repo newbranch`
46 
47 	got checkout -b master $testroot/repo $testroot/wt > /dev/null
48 	ret=$?
49 	if [ $ret -ne 0 ]; then
50 		echo "got checkout failed unexpectedly" >&2
51 		test_done "$testroot" "$ret"
52 		return 1
53 	fi
54 
55 	# need a divergant commit on the main branch for 'got merge'
56 	(cd $testroot/wt && got merge newbranch \
57 		> $testroot/stdout 2> $testroot/stderr)
58 	ret=$?
59 	if [ $ret -eq 0 ]; then
60 		echo "got merge succeeded unexpectedly" >&2
61 		test_done "$testroot" "1"
62 		return 1
63 	fi
64 	echo -n "got: cannot create a merge commit because " \
65 		> $testroot/stderr.expected
66 	echo -n "refs/heads/newbranch is based on refs/heads/master; " \
67 		>> $testroot/stderr.expected
68 	echo -n "refs/heads/newbranch can be integrated with " \
69 		>> $testroot/stderr.expected
70 	echo "'got integrate' instead" >> $testroot/stderr.expected
71 	cmp -s $testroot/stderr.expected $testroot/stderr
72 	ret=$?
73 	if [ $ret -ne 0 ]; then
74 		diff -u $testroot/stderr.expected $testroot/stderr
75 		test_done "$testroot" "$ret"
76 		return 1
77 	fi
78 
79 	# create the required dirvergant commit
80 	(cd $testroot/repo && git checkout -q master)
81 	echo "modified zeta on master" > $testroot/repo/epsilon/zeta
82 	git_commit $testroot/repo -m "committing to zeta on master"
83 	local master_commit=`git_show_head $testroot/repo`
84 
85 	# need an up-to-date work tree for 'got merge'
86 	(cd $testroot/wt && got merge newbranch \
87 		> $testroot/stdout 2> $testroot/stderr)
88 	ret=$?
89 	if [ $ret -eq 0 ]; then
90 		echo "got merge succeeded unexpectedly" >&2
91 		test_done "$testroot" "$ret"
92 		return 1
93 	fi
94 	echo -n "got: work tree must be updated before it can be used " \
95 		> $testroot/stderr.expected
96 	echo "to merge a branch" >> $testroot/stderr.expected
97 	cmp -s $testroot/stderr.expected $testroot/stderr
98 	ret=$?
99 	if [ $ret -ne 0 ]; then
100 		diff -u $testroot/stderr.expected $testroot/stderr
101 		test_done "$testroot" "$ret"
102 		return 1
103 	fi
104 
105 	(cd $testroot/wt && got update > /dev/null)
106 	ret=$?
107 	if [ $ret -ne 0 ]; then
108 		echo "got update failed unexpectedly" >&2
109 		test_done "$testroot" "$ret"
110 		return 1
111 	fi
112 
113 	# must not use a mixed-commit work tree with 'got merge'
114 	(cd $testroot/wt && got update -c $commit0 alpha > /dev/null)
115 	ret=$?
116 	if [ $ret -ne 0 ]; then
117 		echo "got update failed unexpectedly" >&2
118 		test_done "$testroot" "$ret"
119 		return 1
120 	fi
121 	(cd $testroot/wt && got merge newbranch \
122 		> $testroot/stdout 2> $testroot/stderr)
123 	ret=$?
124 	if [ $ret -eq 0 ]; then
125 		echo "got merge succeeded unexpectedly" >&2
126 		test_done "$testroot" "$ret"
127 		return 1
128 	fi
129 	echo -n "got: work tree contains files from multiple base commits; " \
130 		> $testroot/stderr.expected
131 	echo "the entire work tree must be updated first" \
132 		>> $testroot/stderr.expected
133 	cmp -s $testroot/stderr.expected $testroot/stderr
134 	ret=$?
135 	if [ $ret -ne 0 ]; then
136 		diff -u $testroot/stderr.expected $testroot/stderr
137 		test_done "$testroot" "$ret"
138 		return 1
139 	fi
140 
141 	(cd $testroot/wt && got update > /dev/null)
142 	ret=$?
143 	if [ $ret -ne 0 ]; then
144 		echo "got update failed unexpectedly" >&2
145 		test_done "$testroot" "$ret"
146 		return 1
147 	fi
148 
149 	# must not have staged files with 'got merge'
150 	echo "modified file alpha"  > $testroot/wt/alpha
151 	(cd $testroot/wt && got stage alpha > /dev/null)
152 	ret=$?
153 	if [ $ret -ne 0 ]; then
154 		echo "got stage failed unexpectedly" >&2
155 		test_done "$testroot" "$ret"
156 		return 1
157 	fi
158 	(cd $testroot/wt && got merge newbranch \
159 		> $testroot/stdout 2> $testroot/stderr)
160 	ret=$?
161 	if [ $ret -eq 0 ]; then
162 		echo "got merge succeeded unexpectedly" >&2
163 		test_done "$testroot" "$ret"
164 		return 1
165 	fi
166 	echo "got: alpha: file is staged" > $testroot/stderr.expected
167 	cmp -s $testroot/stderr.expected $testroot/stderr
168 	ret=$?
169 	if [ $ret -ne 0 ]; then
170 		diff -u $testroot/stderr.expected $testroot/stderr
171 		test_done "$testroot" "$ret"
172 		return 1
173 	fi
174 	(cd $testroot/wt && got unstage alpha > /dev/null)
175 	ret=$?
176 	if [ $ret -ne 0 ]; then
177 		echo "got unstage failed unexpectedly" >&2
178 		test_done "$testroot" "$ret"
179 		return 1
180 	fi
181 
182 	# must not have local changes with 'got merge'
183 	(cd $testroot/wt && got merge newbranch \
184 		> $testroot/stdout 2> $testroot/stderr)
185 	ret=$?
186 	if [ $ret -eq 0 ]; then
187 		echo "got merge succeeded unexpectedly" >&2
188 		test_done "$testroot" "$ret"
189 		return 1
190 	fi
191 	echo -n "got: work tree contains local changes; " \
192 		> $testroot/stderr.expected
193 	echo "these changes must be committed or reverted first" \
194 		>> $testroot/stderr.expected
195 	cmp -s $testroot/stderr.expected $testroot/stderr
196 	ret=$?
197 	if [ $ret -ne 0 ]; then
198 		diff -u $testroot/stderr.expected $testroot/stderr
199 		test_done "$testroot" "$ret"
200 		return 1
201 	fi
202 
203 	(cd $testroot/wt && got revert alpha > /dev/null)
204 	ret=$?
205 	if [ $ret -ne 0 ]; then
206 		echo "got revert failed unexpectedly" >&2
207 		test_done "$testroot" "$ret"
208 		return 1
209 	fi
210 
211 	(cd $testroot/wt && got merge newbranch > $testroot/stdout)
212 	ret=$?
213 	if [ $ret -ne 0 ]; then
214 		echo "got merge failed unexpectedly" >&2
215 		test_done "$testroot" "$ret"
216 		return 1
217 	fi
218 
219 	local merge_commit=`git_show_head $testroot/repo`
220 
221 	echo "G  alpha" >> $testroot/stdout.expected
222 	echo "D  beta" >> $testroot/stdout.expected
223 	echo "A  dotgotbar.link" >> $testroot/stdout.expected
224 	echo "A  epsilon/new" >> $testroot/stdout.expected
225 	echo "G  gamma/delta" >> $testroot/stdout.expected
226 	echo "A  symlink" >> $testroot/stdout.expected
227 	echo -n "Merged refs/heads/newbranch into refs/heads/master: " \
228 		>> $testroot/stdout.expected
229 	echo $merge_commit >> $testroot/stdout.expected
230 
231 	cmp -s $testroot/stdout.expected $testroot/stdout
232 	ret=$?
233 	if [ $ret -ne 0 ]; then
234 		diff -u $testroot/stdout.expected $testroot/stdout
235 		test_done "$testroot" "$ret"
236 		return 1
237 	fi
238 
239 	echo "modified delta on branch" > $testroot/content.expected
240 	cat $testroot/wt/gamma/delta > $testroot/content
241 	cmp -s $testroot/content.expected $testroot/content
242 	ret=$?
243 	if [ $ret -ne 0 ]; then
244 		diff -u $testroot/content.expected $testroot/content
245 		test_done "$testroot" "$ret"
246 		return 1
247 	fi
248 
249 	echo "modified alpha on branch" > $testroot/content.expected
250 	cat $testroot/wt/alpha > $testroot/content
251 	cmp -s $testroot/content.expected $testroot/content
252 	ret=$?
253 	if [ $ret -ne 0 ]; then
254 		diff -u $testroot/content.expected $testroot/content
255 		test_done "$testroot" "$ret"
256 		return 1
257 	fi
258 
259 	if [ -e $testroot/wt/beta ]; then
260 		echo "removed file beta still exists on disk" >&2
261 		test_done "$testroot" "1"
262 		return 1
263 	fi
264 
265 	echo "new file on branch" > $testroot/content.expected
266 	cat $testroot/wt/epsilon/new > $testroot/content
267 	cmp -s $testroot/content.expected $testroot/content
268 	ret=$?
269 	if [ $ret -ne 0 ]; then
270 		diff -u $testroot/content.expected $testroot/content
271 		test_done "$testroot" "$ret"
272 		return 1
273 	fi
274 
275 	if [ ! -h $testroot/wt/dotgotbar.link ]; then
276 		echo "dotgotbar.link is not a symlink"
277 		test_done "$testroot" "1"
278 		return 1
279 	fi
280 
281 	readlink $testroot/wt/symlink > $testroot/stdout
282 	echo "alpha" > $testroot/stdout.expected
283 	cmp -s $testroot/stdout.expected $testroot/stdout
284 	ret=$?
285 	if [ $ret -ne 0 ]; then
286 		diff -u $testroot/stdout.expected $testroot/stdout
287 		test_done "$testroot" "$ret"
288 		return 1
289 	fi
290 
291 	(cd $testroot/wt && got status > $testroot/stdout)
292 
293 	echo -n > $testroot/stdout.expected
294 	cmp -s $testroot/stdout.expected $testroot/stdout
295 	ret=$?
296 	if [ $ret -ne 0 ]; then
297 		diff -u $testroot/stdout.expected $testroot/stdout
298 		test_done "$testroot" "$ret"
299 		return 1
300 	fi
301 
302 	(cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
303 	echo "commit $merge_commit (master)" > $testroot/stdout.expected
304 	echo "commit $master_commit" >> $testroot/stdout.expected
305 	echo "commit $commit0" >> $testroot/stdout.expected
306 	cmp -s $testroot/stdout.expected $testroot/stdout
307 	ret=$?
308 	if [ $ret -ne 0 ]; then
309 		diff -u $testroot/stdout.expected $testroot/stdout
310 		test_done "$testroot" "$ret"
311 		return 1
312 	fi
313 
314 	(cd $testroot/wt && got update > $testroot/stdout)
315 
316 	echo 'U  dotgotbar.link' > $testroot/stdout.expected
317 	echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
318 	git_show_head $testroot/repo >> $testroot/stdout.expected
319 	echo >> $testroot/stdout.expected
320 	cmp -s $testroot/stdout.expected $testroot/stdout
321 	ret=$?
322 	if [ $ret -ne 0 ]; then
323 		diff -u $testroot/stdout.expected $testroot/stdout
324 		test_done "$testroot" "$ret"
325 		return 1
326 	fi
327 
328 	# update has changed the bad symlink into a regular file
329 	if [ -h $testroot/wt/dotgotbar.link ]; then
330 		echo "dotgotbar.link is a symlink"
331 		test_done "$testroot" "1"
332 		return 1
333 	fi
334 
335 	# We should have created a merge commit with two parents.
336 	(cd $testroot/wt && got log -l1 | grep ^parent > $testroot/stdout)
337 	echo "parent 1: $master_commit" > $testroot/stdout.expected
338 	echo "parent 2: $branch_commit5" >> $testroot/stdout.expected
339 	cmp -s $testroot/stdout.expected $testroot/stdout
340 	ret=$?
341 	if [ $ret -ne 0 ]; then
342 		diff -u $testroot/stdout.expected $testroot/stdout
343 		test_done "$testroot" "$ret"
344 		return 1
345 	fi
346 
347 	got tree -r $testroot/repo -c $merge_commit -R > $testroot/stdout
348 	ret=$?
349 	if [ $ret -ne 0 ]; then
350 		echo "got tree failed unexpectedly" >&2
351 		test_done "$testroot" "$ret"
352 		return 1
353 	fi
354 
355 	# bad symlink dotgotbar.link appears as a symlink in the merge commit:
356 	cat > $testroot/stdout.expected <<EOF
357 alpha
358 dotgotbar.link@ -> .got/bar
359 epsilon/
360 epsilon/new
361 epsilon/zeta
362 gamma/
363 gamma/delta
364 symlink@ -> alpha
365 EOF
366 	cmp -s $testroot/stdout.expected $testroot/stdout
367 	ret=$?
368 	if [ $ret -ne 0 ]; then
369 		diff -u $testroot/stdout.expected $testroot/stdout
370 	fi
371 	test_done "$testroot" "$ret"
372 }
373 
374 test_merge_continue() {
375 	local testroot=`test_init merge_continue`
376 	local commit0=`git_show_head $testroot/repo`
377 	local commit0_author_time=`git_show_author_time $testroot/repo`
378 
379 	(cd $testroot/repo && git checkout -q -b newbranch)
380 	echo "modified delta on branch" > $testroot/repo/gamma/delta
381 	git_commit $testroot/repo -m "committing to delta on newbranch"
382 	local branch_commit0=`git_show_branch_head $testroot/repo newbranch`
383 
384 	echo "modified alpha on branch" > $testroot/repo/alpha
385 	git_commit $testroot/repo -m "committing to alpha on newbranch"
386 	local branch_commit1=`git_show_branch_head $testroot/repo newbranch`
387 	(cd $testroot/repo && git rm -q beta)
388 	git_commit $testroot/repo -m "removing beta on newbranch"
389 	local branch_commit2=`git_show_branch_head $testroot/repo newbranch`
390 	echo "new file on branch" > $testroot/repo/epsilon/new
391 	(cd $testroot/repo && git add epsilon/new)
392 	git_commit $testroot/repo -m "adding new file on newbranch"
393 	local branch_commit3=`git_show_branch_head $testroot/repo newbranch`
394 
395 	got checkout -b master $testroot/repo $testroot/wt > /dev/null
396 	ret=$?
397 	if [ $ret -ne 0 ]; then
398 		echo "got checkout failed unexpectedly" >&2
399 		test_done "$testroot" "$ret"
400 		return 1
401 	fi
402 
403 	# create a conflicting commit
404 	(cd $testroot/repo && git checkout -q master)
405 	echo "modified alpha on master" > $testroot/repo/alpha
406 	git_commit $testroot/repo -m "committing to alpha on master"
407 	local master_commit=`git_show_head $testroot/repo`
408 
409 	# need an up-to-date work tree for 'got merge'
410 	(cd $testroot/wt && got update > /dev/null)
411 	ret=$?
412 	if [ $ret -ne 0 ]; then
413 		echo "got update failed unexpectedly" >&2
414 		test_done "$testroot" "$ret"
415 		return 1
416 	fi
417 
418 	(cd $testroot/wt && got merge newbranch \
419 		> $testroot/stdout 2> $testroot/stderr)
420 	ret=$?
421 	if [ $ret -eq 0 ]; then
422 		echo "got merge succeeded unexpectedly" >&2
423 		test_done "$testroot" "1"
424 		return 1
425 	fi
426 
427 	echo "C  alpha" >> $testroot/stdout.expected
428 	echo "D  beta" >> $testroot/stdout.expected
429 	echo "A  epsilon/new" >> $testroot/stdout.expected
430 	echo "G  gamma/delta" >> $testroot/stdout.expected
431 	echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
432 	cmp -s $testroot/stdout.expected $testroot/stdout
433 	ret=$?
434 	if [ $ret -ne 0 ]; then
435 		diff -u $testroot/stdout.expected $testroot/stdout
436 		test_done "$testroot" "$ret"
437 		return 1
438 	fi
439 
440 	echo "got: conflicts must be resolved before merging can continue" \
441 		> $testroot/stderr.expected
442 	cmp -s $testroot/stderr.expected $testroot/stderr
443 	ret=$?
444 	if [ $ret -ne 0 ]; then
445 		diff -u $testroot/stderr.expected $testroot/stderr
446 		test_done "$testroot" "$ret"
447 		return 1
448 	fi
449 
450 	(cd $testroot/wt && got status > $testroot/stdout)
451 
452 	echo "C  alpha" > $testroot/stdout.expected
453 	echo "D  beta" >> $testroot/stdout.expected
454 	echo "A  epsilon/new" >> $testroot/stdout.expected
455 	echo "M  gamma/delta" >> $testroot/stdout.expected
456 	cmp -s $testroot/stdout.expected $testroot/stdout
457 	ret=$?
458 	if [ $ret -ne 0 ]; then
459 		diff -u $testroot/stdout.expected $testroot/stdout
460 		test_done "$testroot" "$ret"
461 		return 1
462 	fi
463 
464 	echo '<<<<<<<' > $testroot/content.expected
465 	echo "modified alpha on master" >> $testroot/content.expected
466 	echo "||||||| 3-way merge base: commit $commit0" \
467 		>> $testroot/content.expected
468 	echo "alpha" >> $testroot/content.expected
469 	echo "=======" >> $testroot/content.expected
470 	echo "modified alpha on branch" >> $testroot/content.expected
471 	echo ">>>>>>> merged change: commit $branch_commit3" \
472 		>> $testroot/content.expected
473 	cat $testroot/wt/alpha > $testroot/content
474 	cmp -s $testroot/content.expected $testroot/content
475 	ret=$?
476 	if [ $ret -ne 0 ]; then
477 		diff -u $testroot/content.expected $testroot/content
478 		test_done "$testroot" "$ret"
479 		return 1
480 	fi
481 
482 	# resolve the conflict
483 	echo "modified alpha by both branches" > $testroot/wt/alpha
484 
485 	(cd $testroot/wt && got merge -c > $testroot/stdout)
486 	ret=$?
487 	if [ $ret -ne 0 ]; then
488 		echo "got merge failed unexpectedly" >&2
489 		test_done "$testroot" "$ret"
490 		return 1
491 	fi
492 
493 	local merge_commit=`git_show_head $testroot/repo`
494 
495 	echo "M  alpha" > $testroot/stdout.expected
496 	echo "D  beta" >> $testroot/stdout.expected
497 	echo "A  epsilon/new" >> $testroot/stdout.expected
498 	echo "M  gamma/delta" >> $testroot/stdout.expected
499 	echo -n "Merged refs/heads/newbranch into refs/heads/master: " \
500 		>> $testroot/stdout.expected
501 	echo $merge_commit >> $testroot/stdout.expected
502 
503 	cmp -s $testroot/stdout.expected $testroot/stdout
504 	ret=$?
505 	if [ $ret -ne 0 ]; then
506 		diff -u $testroot/stdout.expected $testroot/stdout
507 		test_done "$testroot" "$ret"
508 		return 1
509 	fi
510 
511 	echo "modified delta on branch" > $testroot/content.expected
512 	cat $testroot/wt/gamma/delta > $testroot/content
513 	cmp -s $testroot/content.expected $testroot/content
514 	ret=$?
515 	if [ $ret -ne 0 ]; then
516 		diff -u $testroot/content.expected $testroot/content
517 		test_done "$testroot" "$ret"
518 		return 1
519 	fi
520 
521 	echo "modified alpha by both branches" > $testroot/content.expected
522 	cat $testroot/wt/alpha > $testroot/content
523 	cmp -s $testroot/content.expected $testroot/content
524 	ret=$?
525 	if [ $ret -ne 0 ]; then
526 		diff -u $testroot/content.expected $testroot/content
527 		test_done "$testroot" "$ret"
528 		return 1
529 	fi
530 
531 	if [ -e $testroot/wt/beta ]; then
532 		echo "removed file beta still exists on disk" >&2
533 		test_done "$testroot" "1"
534 		return 1
535 	fi
536 
537 	echo "new file on branch" > $testroot/content.expected
538 	cat $testroot/wt/epsilon/new > $testroot/content
539 	cmp -s $testroot/content.expected $testroot/content
540 	ret=$?
541 	if [ $ret -ne 0 ]; then
542 		diff -u $testroot/content.expected $testroot/content
543 		test_done "$testroot" "$ret"
544 		return 1
545 	fi
546 
547 	(cd $testroot/wt && got status > $testroot/stdout)
548 
549 	echo -n > $testroot/stdout.expected
550 	cmp -s $testroot/stdout.expected $testroot/stdout
551 	ret=$?
552 	if [ $ret -ne 0 ]; then
553 		diff -u $testroot/stdout.expected $testroot/stdout
554 		test_done "$testroot" "$ret"
555 		return 1
556 	fi
557 
558 	(cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
559 	echo "commit $merge_commit (master)" > $testroot/stdout.expected
560 	echo "commit $master_commit" >> $testroot/stdout.expected
561 	echo "commit $commit0" >> $testroot/stdout.expected
562 	cmp -s $testroot/stdout.expected $testroot/stdout
563 	ret=$?
564 	if [ $ret -ne 0 ]; then
565 		diff -u $testroot/stdout.expected $testroot/stdout
566 		test_done "$testroot" "$ret"
567 		return 1
568 	fi
569 
570 	(cd $testroot/wt && got update > $testroot/stdout)
571 
572 	echo 'Already up-to-date' > $testroot/stdout.expected
573 	cmp -s $testroot/stdout.expected $testroot/stdout
574 	ret=$?
575 	if [ $ret -ne 0 ]; then
576 		diff -u $testroot/stdout.expected $testroot/stdout
577 		test_done "$testroot" "$ret"
578 		return 1
579 	fi
580 
581 	# We should have created a merge commit with two parents.
582 	(cd $testroot/wt && got log -l1 | grep ^parent > $testroot/stdout)
583 	echo "parent 1: $master_commit" > $testroot/stdout.expected
584 	echo "parent 2: $branch_commit3" >> $testroot/stdout.expected
585 	cmp -s $testroot/stdout.expected $testroot/stdout
586 	ret=$?
587 	if [ $ret -ne 0 ]; then
588 		diff -u $testroot/stdout.expected $testroot/stdout
589 	fi
590 	test_done "$testroot" "$ret"
591 }
592 
593 test_merge_abort() {
594 	local testroot=`test_init merge_abort`
595 	local commit0=`git_show_head $testroot/repo`
596 	local commit0_author_time=`git_show_author_time $testroot/repo`
597 
598 	(cd $testroot/repo && git checkout -q -b newbranch)
599 	echo "modified delta on branch" > $testroot/repo/gamma/delta
600 	git_commit $testroot/repo -m "committing to delta on newbranch"
601 	local branch_commit0=`git_show_branch_head $testroot/repo newbranch`
602 
603 	echo "modified alpha on branch" > $testroot/repo/alpha
604 	git_commit $testroot/repo -m "committing to alpha on newbranch"
605 	local branch_commit1=`git_show_branch_head $testroot/repo newbranch`
606 	(cd $testroot/repo && git rm -q beta)
607 	git_commit $testroot/repo -m "removing beta on newbranch"
608 	local branch_commit2=`git_show_branch_head $testroot/repo newbranch`
609 	echo "new file on branch" > $testroot/repo/epsilon/new
610 	(cd $testroot/repo && git add epsilon/new)
611 	git_commit $testroot/repo -m "adding new file on newbranch"
612 	local branch_commit3=`git_show_branch_head $testroot/repo newbranch`
613 	(cd $testroot/repo && ln -s alpha symlink && git add symlink)
614 	git_commit $testroot/repo -m "adding symlink on newbranch"
615 	local branch_commit4=`git_show_branch_head $testroot/repo newbranch`
616 
617 	got checkout -b master $testroot/repo $testroot/wt > /dev/null
618 	ret=$?
619 	if [ $ret -ne 0 ]; then
620 		echo "got checkout failed unexpectedly" >&2
621 		test_done "$testroot" "$ret"
622 		return 1
623 	fi
624 
625 	# unrelated unversioned file in work tree
626 	touch $testroot/wt/unversioned-file
627 
628 	# create a conflicting commit
629 	(cd $testroot/repo && git checkout -q master)
630 	echo "modified alpha on master" > $testroot/repo/alpha
631 	git_commit $testroot/repo -m "committing to alpha on master"
632 	local master_commit=`git_show_head $testroot/repo`
633 
634 	# need an up-to-date work tree for 'got merge'
635 	(cd $testroot/wt && got update > /dev/null)
636 	ret=$?
637 	if [ $ret -ne 0 ]; then
638 		echo "got update failed unexpectedly" >&2
639 		test_done "$testroot" "$ret"
640 		return 1
641 	fi
642 
643 	(cd $testroot/wt && got merge newbranch \
644 		> $testroot/stdout 2> $testroot/stderr)
645 	ret=$?
646 	if [ $ret -eq 0 ]; then
647 		echo "got merge succeeded unexpectedly" >&2
648 		test_done "$testroot" "1"
649 		return 1
650 	fi
651 
652 	echo "C  alpha" >> $testroot/stdout.expected
653 	echo "D  beta" >> $testroot/stdout.expected
654 	echo "A  epsilon/new" >> $testroot/stdout.expected
655 	echo "G  gamma/delta" >> $testroot/stdout.expected
656 	echo "A  symlink" >> $testroot/stdout.expected
657 	echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
658 	cmp -s $testroot/stdout.expected $testroot/stdout
659 	ret=$?
660 	if [ $ret -ne 0 ]; then
661 		diff -u $testroot/stdout.expected $testroot/stdout
662 		test_done "$testroot" "$ret"
663 		return 1
664 	fi
665 
666 	echo "got: conflicts must be resolved before merging can continue" \
667 		> $testroot/stderr.expected
668 	cmp -s $testroot/stderr.expected $testroot/stderr
669 	ret=$?
670 	if [ $ret -ne 0 ]; then
671 		diff -u $testroot/stderr.expected $testroot/stderr
672 		test_done "$testroot" "$ret"
673 		return 1
674 	fi
675 
676 	# unrelated added file added during conflict resolution
677 	touch $testroot/wt/added-file
678 	(cd $testroot/wt && got add added-file > /dev/null)
679 
680 	(cd $testroot/wt && got status > $testroot/stdout)
681 
682 	echo "A  added-file" > $testroot/stdout.expected
683 	echo "C  alpha" >> $testroot/stdout.expected
684 	echo "D  beta" >> $testroot/stdout.expected
685 	echo "A  epsilon/new" >> $testroot/stdout.expected
686 	echo "M  gamma/delta" >> $testroot/stdout.expected
687 	echo "A  symlink" >> $testroot/stdout.expected
688 	echo "?  unversioned-file" >> $testroot/stdout.expected
689 	cmp -s $testroot/stdout.expected $testroot/stdout
690 	ret=$?
691 	if [ $ret -ne 0 ]; then
692 		diff -u $testroot/stdout.expected $testroot/stdout
693 		test_done "$testroot" "$ret"
694 		return 1
695 	fi
696 
697 	(cd $testroot/wt && got merge -a > $testroot/stdout)
698 	ret=$?
699 	if [ $ret -ne 0 ]; then
700 		echo "got merge failed unexpectedly" >&2
701 		test_done "$testroot" "$ret"
702 		return 1
703 	fi
704 
705 	echo "R  added-file" > $testroot/stdout.expected
706 	echo "R  alpha" >> $testroot/stdout.expected
707 	echo "R  beta" >> $testroot/stdout.expected
708 	echo "R  epsilon/new" >> $testroot/stdout.expected
709 	echo "R  gamma/delta" >> $testroot/stdout.expected
710 	echo "R  symlink" >> $testroot/stdout.expected
711 	echo "G  added-file" >> $testroot/stdout.expected
712 	echo "Merge of refs/heads/newbranch aborted" \
713 		>> $testroot/stdout.expected
714 
715 	cmp -s $testroot/stdout.expected $testroot/stdout
716 	ret=$?
717 	if [ $ret -ne 0 ]; then
718 		diff -u $testroot/stdout.expected $testroot/stdout
719 		test_done "$testroot" "$ret"
720 		return 1
721 	fi
722 
723 	echo "delta" > $testroot/content.expected
724 	cat $testroot/wt/gamma/delta > $testroot/content
725 	cmp -s $testroot/content.expected $testroot/content
726 	ret=$?
727 	if [ $ret -ne 0 ]; then
728 		diff -u $testroot/content.expected $testroot/content
729 		test_done "$testroot" "$ret"
730 		return 1
731 	fi
732 
733 	echo "modified alpha on master" > $testroot/content.expected
734 	cat $testroot/wt/alpha > $testroot/content
735 	cmp -s $testroot/content.expected $testroot/content
736 	ret=$?
737 	if [ $ret -ne 0 ]; then
738 		diff -u $testroot/content.expected $testroot/content
739 		test_done "$testroot" "$ret"
740 		return 1
741 	fi
742 
743 	echo "beta" > $testroot/content.expected
744 	cat $testroot/wt/beta > $testroot/content
745 	cmp -s $testroot/content.expected $testroot/content
746 	ret=$?
747 	if [ $ret -ne 0 ]; then
748 		diff -u $testroot/content.expected $testroot/content
749 		test_done "$testroot" "$ret"
750 		return 1
751 	fi
752 
753 	if [ -e $testroot/wt/epsilon/new ]; then
754 		echo "reverted file epsilon/new still exists on disk" >&2
755 		test_done "$testroot" "1"
756 		return 1
757 	fi
758 
759 	if [ -e $testroot/wt/symlink ]; then
760 		echo "reverted symlink still exists on disk" >&2
761 		test_done "$testroot" "1"
762 		return 1
763 	fi
764 
765 	(cd $testroot/wt && got status > $testroot/stdout)
766 
767 	echo "?  added-file" > $testroot/stdout.expected
768 	echo "?  unversioned-file" >> $testroot/stdout.expected
769 	cmp -s $testroot/stdout.expected $testroot/stdout
770 	ret=$?
771 	if [ $ret -ne 0 ]; then
772 		diff -u $testroot/stdout.expected $testroot/stdout
773 		test_done "$testroot" "$ret"
774 		return 1
775 	fi
776 
777 	(cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
778 	echo "commit $master_commit (master)" > $testroot/stdout.expected
779 	echo "commit $commit0" >> $testroot/stdout.expected
780 	cmp -s $testroot/stdout.expected $testroot/stdout
781 	ret=$?
782 	if [ $ret -ne 0 ]; then
783 		diff -u $testroot/stdout.expected $testroot/stdout
784 		test_done "$testroot" "$ret"
785 		return 1
786 	fi
787 
788 	(cd $testroot/wt && got update > $testroot/stdout)
789 
790 	echo 'Already up-to-date' > $testroot/stdout.expected
791 	cmp -s $testroot/stdout.expected $testroot/stdout
792 	ret=$?
793 	if [ $ret -ne 0 ]; then
794 		diff -u $testroot/stdout.expected $testroot/stdout
795 	fi
796 	test_done "$testroot" "$ret"
797 }
798 
799 test_merge_in_progress() {
800 	local testroot=`test_init merge_in_progress`
801 	local commit0=`git_show_head $testroot/repo`
802 	local commit0_author_time=`git_show_author_time $testroot/repo`
803 
804 	(cd $testroot/repo && git checkout -q -b newbranch)
805 	echo "modified alpha on branch" > $testroot/repo/alpha
806 	git_commit $testroot/repo -m "committing to alpha on newbranch"
807 	local branch_commit0=`git_show_branch_head $testroot/repo newbranch`
808 
809 	got checkout -b master $testroot/repo $testroot/wt > /dev/null
810 	ret=$?
811 	if [ $ret -ne 0 ]; then
812 		echo "got checkout failed unexpectedly" >&2
813 		test_done "$testroot" "$ret"
814 		return 1
815 	fi
816 
817 	# create a conflicting commit
818 	(cd $testroot/repo && git checkout -q master)
819 	echo "modified alpha on master" > $testroot/repo/alpha
820 	git_commit $testroot/repo -m "committing to alpha on master"
821 	local master_commit=`git_show_head $testroot/repo`
822 
823 	# need an up-to-date work tree for 'got merge'
824 	(cd $testroot/wt && got update > /dev/null)
825 	ret=$?
826 	if [ $ret -ne 0 ]; then
827 		echo "got update failed unexpectedly" >&2
828 		test_done "$testroot" "$ret"
829 		return 1
830 	fi
831 
832 	(cd $testroot/wt && got merge newbranch \
833 		> $testroot/stdout 2> $testroot/stderr)
834 	ret=$?
835 	if [ $ret -eq 0 ]; then
836 		echo "got merge succeeded unexpectedly" >&2
837 		test_done "$testroot" "1"
838 		return 1
839 	fi
840 
841 	echo "C  alpha" >> $testroot/stdout.expected
842 	echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
843 	cmp -s $testroot/stdout.expected $testroot/stdout
844 	ret=$?
845 	if [ $ret -ne 0 ]; then
846 		diff -u $testroot/stdout.expected $testroot/stdout
847 		test_done "$testroot" "$ret"
848 		return 1
849 	fi
850 
851 	echo "got: conflicts must be resolved before merging can continue" \
852 		> $testroot/stderr.expected
853 	cmp -s $testroot/stderr.expected $testroot/stderr
854 	ret=$?
855 	if [ $ret -ne 0 ]; then
856 		diff -u $testroot/stderr.expected $testroot/stderr
857 		test_done "$testroot" "$ret"
858 		return 1
859 	fi
860 
861 	(cd $testroot/wt && got status > $testroot/stdout)
862 
863 	echo "C  alpha" > $testroot/stdout.expected
864 	cmp -s $testroot/stdout.expected $testroot/stdout
865 	ret=$?
866 	if [ $ret -ne 0 ]; then
867 		diff -u $testroot/stdout.expected $testroot/stdout
868 		test_done "$testroot" "$ret"
869 		return 1
870 	fi
871 
872 	for cmd in update commit histedit "rebase newbranch" \
873 		"integrate newbranch" "stage alpha"; do
874 		(cd $testroot/wt && got $cmd > $testroot/stdout \
875 			2> $testroot/stderr)
876 
877 		echo -n > $testroot/stdout.expected
878 		cmp -s $testroot/stdout.expected $testroot/stdout
879 		ret=$?
880 		if [ $ret -ne 0 ]; then
881 			diff -u $testroot/stdout.expected $testroot/stdout
882 			test_done "$testroot" "$ret"
883 			return 1
884 		fi
885 
886 		echo -n "got: a merge operation is in progress in this " \
887 			> $testroot/stderr.expected
888 		echo "work tree and must be continued or aborted first" \
889 			>> $testroot/stderr.expected
890 		cmp -s $testroot/stderr.expected $testroot/stderr
891 		ret=$?
892 		if [ $ret -ne 0 ]; then
893 			diff -u $testroot/stderr.expected $testroot/stderr
894 			test_done "$testroot" "$ret"
895 			return 1
896 		fi
897 	done
898 
899 	test_done "$testroot" "$ret"
900 }
901 
902 test_merge_path_prefix() {
903 	local testroot=`test_init merge_path_prefix`
904 	local commit0=`git_show_head $testroot/repo`
905 	local commit0_author_time=`git_show_author_time $testroot/repo`
906 
907 	(cd $testroot/repo && git checkout -q -b newbranch)
908 	echo "modified alpha on branch" > $testroot/repo/alpha
909 	git_commit $testroot/repo -m "committing to alpha on newbranch"
910 	local branch_commit0=`git_show_branch_head $testroot/repo newbranch`
911 
912 	got checkout -p epsilon -b master $testroot/repo $testroot/wt \
913 		> /dev/null
914 	ret=$?
915 	if [ $ret -ne 0 ]; then
916 		echo "got checkout failed unexpectedly" >&2
917 		test_done "$testroot" "$ret"
918 		return 1
919 	fi
920 
921 	# create a conflicting commit
922 	(cd $testroot/repo && git checkout -q master)
923 	echo "modified alpha on master" > $testroot/repo/alpha
924 	git_commit $testroot/repo -m "committing to alpha on master"
925 	local master_commit=`git_show_head $testroot/repo`
926 
927 	# need an up-to-date work tree for 'got merge'
928 	(cd $testroot/wt && got update > /dev/null)
929 	ret=$?
930 	if [ $ret -ne 0 ]; then
931 		echo "got update failed unexpectedly" >&2
932 		test_done "$testroot" "$ret"
933 		return 1
934 	fi
935 
936 	(cd $testroot/wt && got merge newbranch \
937 		> $testroot/stdout 2> $testroot/stderr)
938 	ret=$?
939 	if [ $ret -eq 0 ]; then
940 		echo "got merge succeeded unexpectedly" >&2
941 		test_done "$testroot" "1"
942 		return 1
943 	fi
944 
945 	echo -n "got: cannot merge branch which contains changes outside " \
946 		> $testroot/stderr.expected
947 	echo "of this work tree's path prefix" >> $testroot/stderr.expected
948 	cmp -s $testroot/stderr.expected $testroot/stderr
949 	ret=$?
950 	if [ $ret -ne 0 ]; then
951 		diff -u $testroot/stderr.expected $testroot/stderr
952 	fi
953 	test_done "$testroot" "$ret"
954 }
955 
956 test_merge_missing_file() {
957 	local testroot=`test_init merge_missing_file`
958 	local commit0=`git_show_head $testroot/repo`
959 	local commit0_author_time=`git_show_author_time $testroot/repo`
960 
961 	(cd $testroot/repo && git checkout -q -b newbranch)
962 	echo "modified alpha on branch" > $testroot/repo/alpha
963 	echo "modified delta on branch" > $testroot/repo/gamma/delta
964 	git_commit $testroot/repo -m "committing to alpha and delta"
965 	local branch_commit0=`git_show_branch_head $testroot/repo newbranch`
966 
967 	got checkout -b master $testroot/repo $testroot/wt > /dev/null
968 	ret=$?
969 	if [ $ret -ne 0 ]; then
970 		echo "got checkout failed unexpectedly" >&2
971 		test_done "$testroot" "$ret"
972 		return 1
973 	fi
974 
975 	# create a conflicting commit which renames alpha
976 	(cd $testroot/repo && git checkout -q master)
977 	(cd $testroot/repo && git mv alpha epsilon/alpha-moved)
978 	git_commit $testroot/repo -m "moving alpha on master"
979 	local master_commit=`git_show_head $testroot/repo`
980 
981 	# need an up-to-date work tree for 'got merge'
982 	(cd $testroot/wt && got update > /dev/null)
983 	ret=$?
984 	if [ $ret -ne 0 ]; then
985 		echo "got update failed unexpectedly" >&2
986 		test_done "$testroot" "$ret"
987 		return 1
988 	fi
989 
990 	(cd $testroot/wt && got merge newbranch \
991 		> $testroot/stdout 2> $testroot/stderr)
992 	ret=$?
993 	if [ $ret -eq 0 ]; then
994 		echo "got merge succeeded unexpectedly" >&2
995 		test_done "$testroot" "1"
996 		return 1
997 	fi
998 
999 	echo "!  alpha" > $testroot/stdout.expected
1000 	echo "G  gamma/delta" >> $testroot/stdout.expected
1001 	echo -n "Files which had incoming changes but could not be found " \
1002 		>> $testroot/stdout.expected
1003 	echo "in the work tree: 1" >> $testroot/stdout.expected
1004 	cmp -s $testroot/stdout.expected $testroot/stdout
1005 	ret=$?
1006 	if [ $ret -ne 0 ]; then
1007 		diff -u $testroot/stdout.expected $testroot/stdout
1008 		test_done "$testroot" "$ret"
1009 		return 1
1010 	fi
1011 
1012 	echo -n "got: changes destined for some files " \
1013 		> $testroot/stderr.expected
1014 	echo -n "were not yet merged and should be merged manually if " \
1015 		>> $testroot/stderr.expected
1016 	echo "required before the merge operation is continued" \
1017 		>> $testroot/stderr.expected
1018 	cmp -s $testroot/stderr.expected $testroot/stderr
1019 	ret=$?
1020 	if [ $ret -ne 0 ]; then
1021 		diff -u $testroot/stderr.expected $testroot/stderr
1022 		test_done "$testroot" "$ret"
1023 		return 1
1024 	fi
1025 
1026 	(cd $testroot/wt && got status > $testroot/stdout)
1027 
1028 	echo "M  gamma/delta" > $testroot/stdout.expected
1029 	cmp -s $testroot/stdout.expected $testroot/stdout
1030 	ret=$?
1031 	if [ $ret -ne 0 ]; then
1032 		diff -u $testroot/stdout.expected $testroot/stdout
1033 		test_done "$testroot" "$ret"
1034 		return 1
1035 	fi
1036 
1037 	test_done "$testroot" "$ret"
1038 }
1039 
1040 test_merge_no_op() {
1041 	local testroot=`test_init merge_no_op`
1042 	local commit0=`git_show_head $testroot/repo`
1043 	local commit0_author_time=`git_show_author_time $testroot/repo`
1044 
1045 	(cd $testroot/repo && git checkout -q -b newbranch)
1046 	echo "modified alpha on branch" > $testroot/repo/alpha
1047 	git_commit $testroot/repo -m "committing to alpha on newbranch"
1048 	local branch_commit=`git_show_branch_head $testroot/repo newbranch`
1049 
1050 	got checkout -b master $testroot/repo $testroot/wt > /dev/null
1051 	ret=$?
1052 	if [ $ret -ne 0 ]; then
1053 		echo "got checkout failed unexpectedly" >&2
1054 		test_done "$testroot" "$ret"
1055 		return 1
1056 	fi
1057 
1058 	# create a conflicting commit
1059 	(cd $testroot/repo && git checkout -q master)
1060 	echo "modified alpha on master" > $testroot/repo/alpha
1061 	git_commit $testroot/repo -m "committing to alpha on master"
1062 	local master_commit=`git_show_head $testroot/repo`
1063 
1064 	# need an up-to-date work tree for 'got merge'
1065 	(cd $testroot/wt && got update > /dev/null)
1066 	ret=$?
1067 	if [ $ret -ne 0 ]; then
1068 		echo "got update failed unexpectedly" >&2
1069 		test_done "$testroot" "$ret"
1070 		return 1
1071 	fi
1072 
1073 	(cd $testroot/wt && got merge newbranch \
1074 		> $testroot/stdout 2> $testroot/stderr)
1075 	ret=$?
1076 	if [ $ret -eq 0 ]; then
1077 		echo "got merge succeeded unexpectedly" >&2
1078 		test_done "$testroot" "1"
1079 		return 1
1080 	fi
1081 
1082 	echo "C  alpha" >> $testroot/stdout.expected
1083 	echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
1084 	cmp -s $testroot/stdout.expected $testroot/stdout
1085 	ret=$?
1086 	if [ $ret -ne 0 ]; then
1087 		diff -u $testroot/stdout.expected $testroot/stdout
1088 		test_done "$testroot" "$ret"
1089 		return 1
1090 	fi
1091 
1092 	echo "got: conflicts must be resolved before merging can continue" \
1093 		> $testroot/stderr.expected
1094 	cmp -s $testroot/stderr.expected $testroot/stderr
1095 	ret=$?
1096 	if [ $ret -ne 0 ]; then
1097 		diff -u $testroot/stderr.expected $testroot/stderr
1098 		test_done "$testroot" "$ret"
1099 		return 1
1100 	fi
1101 
1102 	(cd $testroot/wt && got status > $testroot/stdout)
1103 
1104 	echo "C  alpha" > $testroot/stdout.expected
1105 	cmp -s $testroot/stdout.expected $testroot/stdout
1106 	ret=$?
1107 	if [ $ret -ne 0 ]; then
1108 		diff -u $testroot/stdout.expected $testroot/stdout
1109 		test_done "$testroot" "$ret"
1110 		return 1
1111 	fi
1112 
1113 	# resolve the conflict by reverting all changes; now it is no-op merge
1114 	(cd $testroot/wt && got revert alpha > /dev/null)
1115 	ret=$?
1116 	if [ $ret -ne 0 ]; then
1117 		echo "got revert failed unexpectedly" >&2
1118 		test_done "$testroot" "$ret"
1119 		return 1
1120 	fi
1121 
1122 	(cd $testroot/wt && got merge -c > $testroot/stdout \
1123 		2> $testroot/stderr)
1124 	ret=$?
1125 	if [ $ret -ne 0 ]; then
1126 		echo "got merge failed unexpectedly" >&2
1127 		test_done "$testroot" "$ret"
1128 		return 1
1129 	fi
1130 
1131 	echo -n '' > $testroot/stderr.expected
1132 	cmp -s $testroot/stderr.expected $testroot/stderr
1133 	ret=$?
1134 	if [ $ret -ne 0 ]; then
1135 		diff -u $testroot/stderr.expected $testroot/stderr
1136 		test_done "$testroot" "$ret"
1137 		return 1
1138 	fi
1139 
1140 	local merge_commit=`git_show_head $testroot/repo`
1141 	echo -n "Merged refs/heads/newbranch into refs/heads/master: " \
1142 		> $testroot/stdout.expected
1143 	echo $merge_commit >> $testroot/stdout.expected
1144 
1145 	cmp -s $testroot/stdout.expected $testroot/stdout
1146 	ret=$?
1147 	if [ $ret -ne 0 ]; then
1148 		diff -u $testroot/stdout.expected $testroot/stdout
1149 		test_done "$testroot" "$ret"
1150 		return 1
1151 	fi
1152 
1153 	(cd $testroot/wt && got status > $testroot/stdout)
1154 
1155 	echo -n "" > $testroot/stdout.expected
1156 	cmp -s $testroot/stdout.expected $testroot/stdout
1157 	ret=$?
1158 	if [ $ret -ne 0 ]; then
1159 		diff -u $testroot/stdout.expected $testroot/stdout
1160 		test_done "$testroot" "$ret"
1161 		return 1
1162 	fi
1163 
1164 	# We should have created a merge commit with two parents.
1165 	got log -r $testroot/repo -l1 -c $merge_commit | grep ^parent \
1166 		> $testroot/stdout
1167 	echo "parent 1: $master_commit" > $testroot/stdout.expected
1168 	echo "parent 2: $branch_commit" >> $testroot/stdout.expected
1169 	cmp -s $testroot/stdout.expected $testroot/stdout
1170 	ret=$?
1171 	if [ $ret -ne 0 ]; then
1172 		diff -u $testroot/stdout.expected $testroot/stdout
1173 	fi
1174 	test_done "$testroot" "$ret"
1175 }
1176 
1177 test_merge_imported_branch() {
1178 	local testroot=`test_init merge_import`
1179 	local commit0=`git_show_head $testroot/repo`
1180 	local commit0_author_time=`git_show_author_time $testroot/repo`
1181 
1182 	# import a new sub-tree to the 'files' branch such that
1183 	# none of the files added here collide with existing ones
1184 	mkdir -p $testroot/tree/there
1185 	mkdir -p $testroot/tree/be/lots
1186 	mkdir -p $testroot/tree/files
1187 	echo "there should" > $testroot/tree/there/should
1188 	echo "be lots of" > $testroot/tree/be/lots/of
1189 	echo "files here" > $testroot/tree/files/here
1190 	got import -r $testroot/repo -b files -m 'import files' \
1191 		$testroot/tree > /dev/null
1192 
1193 	got checkout -b master $testroot/repo $testroot/wt > /dev/null
1194 	ret=$?
1195 	if [ $ret -ne 0 ]; then
1196 		echo "got checkout failed unexpectedly" >&2
1197 		test_done "$testroot" "$ret"
1198 		return 1
1199 	fi
1200 
1201 	(cd $testroot/wt && got merge files > $testroot/stdout)
1202 	ret=$?
1203 	if [ $ret -ne 0 ]; then
1204 		echo "got merge failed unexpectedly" >&2
1205 		test_done "$testroot" "$ret"
1206 		return 1
1207 	fi
1208 
1209 	local merge_commit0=`git_show_head $testroot/repo`
1210 	cat > $testroot/stdout.expected <<EOF
1211 A  be/lots/of
1212 A  files/here
1213 A  there/should
1214 Merged refs/heads/files into refs/heads/master: $merge_commit0
1215 EOF
1216 	cmp -s $testroot/stdout.expected $testroot/stdout
1217 	ret=$?
1218 	if [ $ret -ne 0 ]; then
1219 		diff -u $testroot/stdout.expected $testroot/stdout
1220 		test_done "$testroot" "$ret"
1221 		return 1
1222 	fi
1223 
1224 	# try to merge again while no new changes are available
1225 	(cd $testroot/wt && got merge files > $testroot/stdout)
1226 	ret=$?
1227 	if [ $ret -ne 0 ]; then
1228 		echo "got merge failed unexpectedly" >&2
1229 		test_done "$testroot" "$ret"
1230 		return 1
1231 	fi
1232 	echo "Already up-to-date" > $testroot/stdout.expected
1233 	cmp -s $testroot/stdout.expected $testroot/stdout
1234 	ret=$?
1235 	if [ $ret -ne 0 ]; then
1236 		diff -u $testroot/stdout.expected $testroot/stdout
1237 		test_done "$testroot" "$ret"
1238 		return 1
1239 	fi
1240 
1241 	# update the 'files' branch
1242 	(cd $testroot/repo && git reset -q --hard master)
1243 	(cd $testroot/repo && git checkout -q files)
1244 	echo "indeed" > $testroot/repo/indeed
1245 	(cd $testroot/repo && git add indeed)
1246 	git_commit $testroot/repo -m "adding another file indeed"
1247 	echo "be lots and lots of" > $testroot/repo/be/lots/of
1248 	git_commit $testroot/repo -m "lots of changes"
1249 
1250 	(cd $testroot/wt && got update > /dev/null)
1251 	ret=$?
1252 	if [ $ret -ne 0 ]; then
1253 		echo "got update failed unexpectedly" >&2
1254 		test_done "$testroot" "$ret"
1255 		return 1
1256 	fi
1257 
1258 	# we should now be able to merge more changes from files branch
1259 	(cd $testroot/wt && got merge files > $testroot/stdout)
1260 	ret=$?
1261 	if [ $ret -ne 0 ]; then
1262 		echo "got merge failed unexpectedly" >&2
1263 		test_done "$testroot" "$ret"
1264 		return 1
1265 	fi
1266 
1267 	local merge_commit1=`git_show_branch_head $testroot/repo master`
1268 	cat > $testroot/stdout.expected <<EOF
1269 G  be/lots/of
1270 A  indeed
1271 Merged refs/heads/files into refs/heads/master: $merge_commit1
1272 EOF
1273 
1274 	cmp -s $testroot/stdout.expected $testroot/stdout
1275 	ret=$?
1276 	if [ $ret -ne 0 ]; then
1277 		diff -u $testroot/stdout.expected $testroot/stdout
1278 	fi
1279 	test_done "$testroot" "$ret"
1280 }
1281 
1282 test_merge_interrupt() {
1283 	local testroot=`test_init merge_interrupt`
1284 	local commit0=`git_show_head $testroot/repo`
1285 	local commit0_author_time=`git_show_author_time $testroot/repo`
1286 
1287 	(cd $testroot/repo && git checkout -q -b newbranch)
1288 	echo "modified alpha on branch" > $testroot/repo/alpha
1289 	git_commit $testroot/repo -m "committing to alpha on newbranch"
1290 	local branch_commit0=`git_show_branch_head $testroot/repo newbranch`
1291 
1292 	got checkout -b master $testroot/repo $testroot/wt > /dev/null
1293 	ret=$?
1294 	if [ $ret -ne 0 ]; then
1295 		echo "got checkout failed unexpectedly" >&2
1296 		test_done "$testroot" "$ret"
1297 		return 1
1298 	fi
1299 
1300 	# create a non-conflicting commit
1301 	(cd $testroot/repo && git checkout -q master)
1302 	echo "modified beta on master" > $testroot/repo/beta
1303 	git_commit $testroot/repo -m "committing to beta on master"
1304 	local master_commit=`git_show_head $testroot/repo`
1305 
1306 	# need an up-to-date work tree for 'got merge'
1307 	(cd $testroot/wt && got update > /dev/null)
1308 	ret=$?
1309 	if [ $ret -ne 0 ]; then
1310 		echo "got update failed unexpectedly" >&2
1311 		test_done "$testroot" "$ret"
1312 		return 1
1313 	fi
1314 
1315 	(cd $testroot/wt && got merge -n newbranch \
1316 		> $testroot/stdout 2> $testroot/stderr)
1317 	ret=$?
1318 	if [ $ret -ne 0 ]; then
1319 		echo "got merge failed unexpectedly" >&2
1320 		test_done "$testroot" "1"
1321 		return 1
1322 	fi
1323 
1324 	echo "G  alpha" > $testroot/stdout.expected
1325 	echo "Merge of refs/heads/newbranch interrupted on request" \
1326 		>> $testroot/stdout.expected
1327 	cmp -s $testroot/stdout.expected $testroot/stdout
1328 	ret=$?
1329 	if [ $ret -ne 0 ]; then
1330 		diff -u $testroot/stdout.expected $testroot/stdout
1331 		test_done "$testroot" "$ret"
1332 		return 1
1333 	fi
1334 
1335 	(cd $testroot/wt && got status > $testroot/stdout)
1336 
1337 	echo "M  alpha" > $testroot/stdout.expected
1338 	cmp -s $testroot/stdout.expected $testroot/stdout
1339 	ret=$?
1340 	if [ $ret -ne 0 ]; then
1341 		diff -u $testroot/stdout.expected $testroot/stdout
1342 		test_done "$testroot" "$ret"
1343 		return 1
1344 	fi
1345 
1346 	echo "modified alpha on branch" > $testroot/content.expected
1347 	cat $testroot/wt/alpha > $testroot/content
1348 	cmp -s $testroot/content.expected $testroot/content
1349 	ret=$?
1350 	if [ $ret -ne 0 ]; then
1351 		diff -u $testroot/content.expected $testroot/content
1352 		test_done "$testroot" "$ret"
1353 		return 1
1354 	fi
1355 
1356 	# adjust merge result
1357 	echo "adjusted merge result" > $testroot/wt/alpha
1358 
1359 	# continue the merge
1360 	(cd $testroot/wt && got merge -c > $testroot/stdout)
1361 	ret=$?
1362 	if [ $ret -ne 0 ]; then
1363 		echo "got merge failed unexpectedly" >&2
1364 		test_done "$testroot" "$ret"
1365 		return 1
1366 	fi
1367 
1368 	local merge_commit=`git_show_head $testroot/repo`
1369 
1370 	echo "M  alpha" > $testroot/stdout.expected
1371 	echo -n "Merged refs/heads/newbranch into refs/heads/master: " \
1372 		>> $testroot/stdout.expected
1373 	echo $merge_commit >> $testroot/stdout.expected
1374 
1375 	cmp -s $testroot/stdout.expected $testroot/stdout
1376 	ret=$?
1377 	if [ $ret -ne 0 ]; then
1378 		diff -u $testroot/stdout.expected $testroot/stdout
1379 		test_done "$testroot" "$ret"
1380 		return 1
1381 	fi
1382 
1383 	(cd $testroot/wt && got status > $testroot/stdout)
1384 
1385 	echo -n > $testroot/stdout.expected
1386 	cmp -s $testroot/stdout.expected $testroot/stdout
1387 	ret=$?
1388 	if [ $ret -ne 0 ]; then
1389 		diff -u $testroot/stdout.expected $testroot/stdout
1390 		test_done "$testroot" "$ret"
1391 		return 1
1392 	fi
1393 
1394 	(cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout)
1395 	echo "commit $merge_commit (master)" > $testroot/stdout.expected
1396 	echo "commit $master_commit" >> $testroot/stdout.expected
1397 	echo "commit $commit0" >> $testroot/stdout.expected
1398 	cmp -s $testroot/stdout.expected $testroot/stdout
1399 	ret=$?
1400 	if [ $ret -ne 0 ]; then
1401 		diff -u $testroot/stdout.expected $testroot/stdout
1402 		test_done "$testroot" "$ret"
1403 		return 1
1404 	fi
1405 
1406 	(cd $testroot/wt && got update > $testroot/stdout)
1407 
1408 	echo 'Already up-to-date' > $testroot/stdout.expected
1409 	cmp -s $testroot/stdout.expected $testroot/stdout
1410 	ret=$?
1411 	if [ $ret -ne 0 ]; then
1412 		diff -u $testroot/stdout.expected $testroot/stdout
1413 		test_done "$testroot" "$ret"
1414 		return 1
1415 	fi
1416 
1417 	# We should have created a merge commit with two parents.
1418 	(cd $testroot/wt && got log -l1 | grep ^parent > $testroot/stdout)
1419 	echo "parent 1: $master_commit" > $testroot/stdout.expected
1420 	echo "parent 2: $branch_commit0" >> $testroot/stdout.expected
1421 	cmp -s $testroot/stdout.expected $testroot/stdout
1422 	ret=$?
1423 	if [ $ret -ne 0 ]; then
1424 		diff -u $testroot/stdout.expected $testroot/stdout
1425 	fi
1426 	test_done "$testroot" "$ret"
1427 }
1428 
1429 test_merge_umask() {
1430 	local testroot=`test_init merge_umask`
1431 
1432 	(cd $testroot/repo && git checkout -q -b newbranch)
1433 	echo "modified alpha on branch" >$testroot/repo/alpha
1434 	git_commit "$testroot/repo" -m "committing alpha on newbranch"
1435 	echo "modified delta on branch" >$testroot/repo/gamma/delta
1436 	git_commit "$testroot/repo" -m "committing delta on newbranch"
1437 
1438 	# diverge from newbranch
1439 	(cd "$testroot/repo" && git checkout -q master)
1440 	echo "modified beta on master" >$testroot/repo/beta
1441 	git_commit "$testroot/repo" -m "committing zeto no master"
1442 
1443 	got checkout "$testroot/repo" "$testroot/wt" >/dev/null
1444 
1445 	# using a subshell to avoid clobbering global umask
1446 	(umask 077 && cd "$testroot/wt" && got merge newbranch) >/dev/null
1447 
1448 	for f in alpha gamma/delta; do
1449 		ls -l "$testroot/wt/$f" | grep -q ^-rw-------
1450 		if [ $? -ne 0 ]; then
1451 			echo "$f is not 0600 after merge" >&2
1452 			ls -l "$testroot/wt/$f" >&2
1453 			test_done "$testroot" 1
1454 		fi
1455 	done
1456 
1457 	test_done "$testroot" 0
1458 }
1459 
1460 test_merge_gitconfig_author() {
1461 	local testroot=`test_init merge_gitconfig_author`
1462 
1463 	(cd $testroot/repo && git config user.name 'Flan Luck')
1464 	(cd $testroot/repo && git config user.email 'flan_luck@openbsd.org')
1465 
1466 	(cd $testroot/repo && git checkout -q -b newbranch)
1467 	echo "modified alpha on branch" >$testroot/repo/alpha
1468 	git_commit "$testroot/repo" -m "committing alpha on newbranch"
1469 	echo "modified delta on branch" >$testroot/repo/gamma/delta
1470 	git_commit "$testroot/repo" -m "committing delta on newbranch"
1471 
1472 	# diverge from newbranch
1473 	(cd "$testroot/repo" && git checkout -q master)
1474 	echo "modified beta on master" >$testroot/repo/beta
1475 	git_commit "$testroot/repo" -m "committing zeto no master"
1476 
1477 	got checkout "$testroot/repo" "$testroot/wt" >/dev/null
1478 
1479 	# unset in a subshell to avoid affecting our environment
1480 	(unset GOT_IGNORE_GITCONFIG && cd $testroot/wt && \
1481 		 got merge newbranch > /dev/null)
1482 
1483 	(cd $testroot/repo && got log -l1 | grep ^from: > $testroot/stdout)
1484 	ret=$?
1485 	if [ $ret -ne 0 ]; then
1486 		test_done "$testroot" "$ret"
1487 		return 1
1488 	fi
1489 
1490 	echo "from: Flan Luck <flan_luck@openbsd.org>" \
1491 		> $testroot/stdout.expected
1492 	cmp -s $testroot/stdout.expected $testroot/stdout
1493 	ret=$?
1494 	if [ $ret -ne 0 ]; then
1495 		diff -u $testroot/stdout.expected $testroot/stdout
1496 	fi
1497 	test_done "$testroot" "$ret"
1498 }
1499 
1500 test_parseargs "$@"
1501 run_test test_merge_basic
1502 run_test test_merge_continue
1503 run_test test_merge_abort
1504 run_test test_merge_in_progress
1505 run_test test_merge_path_prefix
1506 run_test test_merge_missing_file
1507 run_test test_merge_no_op
1508 run_test test_merge_imported_branch
1509 run_test test_merge_interrupt
1510 run_test test_merge_umask
1511 run_test test_merge_gitconfig_author