Gotweb

Blob

Date:: Sat Feb 18 16:32:32 2023 UTC
Message:: add ci/he/mg/rb -C option to commit unresolved conflicts As per stsp's suggestion and building on his initial diff, add the -C option to enable creating commits with unresolved conflicts to the commit, histedit, merge, and rebase commands to allow continuing the operation despite files in conflict status. Also, only search for conflict markers in newly added lines to enable working with files already under version control that may have conflict markers embedded verbatim. lots of tweaks, improvements, and initial diff + ok stsp@
Actions:: History | Blame | Raw File
1 #!/bin/sh
2 #
3 # Copyright (c) 2019 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_commit_basic() {
20 	local testroot=`test_init commit_basic`
21 
22 	got checkout $testroot/repo $testroot/wt > /dev/null
23 	ret=$?
24 	if [ $ret -ne 0 ]; then
25 		test_done "$testroot" "$ret"
26 		return 1
27 	fi
28 
29 	echo "modified alpha" > $testroot/wt/alpha
30 	(cd $testroot/wt && got rm beta >/dev/null)
31 	echo "new file" > $testroot/wt/new
32 	(cd $testroot/wt && got add new >/dev/null)
33 
34 	(cd $testroot/wt && got commit -m 'test commit_basic' > $testroot/stdout)
35 
36 	local head_rev=`git_show_head $testroot/repo`
37 	echo "A  new" > $testroot/stdout.expected
38 	echo "M  alpha" >> $testroot/stdout.expected
39 	echo "D  beta" >> $testroot/stdout.expected
40 	echo "Created commit $head_rev" >> $testroot/stdout.expected
41 
42 	cmp -s $testroot/stdout.expected $testroot/stdout
43 	ret=$?
44 	if [ $ret -ne 0 ]; then
45 		diff -u $testroot/stdout.expected $testroot/stdout
46 	fi
47 	test_done "$testroot" "$ret"
48 }
49 
50 test_commit_new_subdir() {
51 	local testroot=`test_init commit_new_subdir`
52 
53 	got checkout $testroot/repo $testroot/wt > /dev/null
54 	ret=$?
55 	if [ $ret -ne 0 ]; then
56 		test_done "$testroot" "$ret"
57 		return 1
58 	fi
59 
60 	mkdir -p $testroot/wt/d
61 	echo "new file" > $testroot/wt/d/new
62 	echo "another new file" > $testroot/wt/d/new2
63 	(cd $testroot/wt && got add d/new >/dev/null)
64 	(cd $testroot/wt && got add d/new2 >/dev/null)
65 
66 	(cd $testroot/wt && \
67 		got commit -m 'test commit_new_subdir' > $testroot/stdout)
68 
69 	local head_rev=`git_show_head $testroot/repo`
70 	echo "A  d/new" > $testroot/stdout.expected
71 	echo "A  d/new2" >> $testroot/stdout.expected
72 	echo "Created commit $head_rev" >> $testroot/stdout.expected
73 
74 	cmp -s $testroot/stdout.expected $testroot/stdout
75 	ret=$?
76 	if [ $ret -ne 0 ]; then
77 		diff -u $testroot/stdout.expected $testroot/stdout
78 	fi
79 	test_done "$testroot" "$ret"
80 }
81 
82 test_commit_subdir() {
83 	local testroot=`test_init commit_subdir`
84 
85 	got checkout $testroot/repo $testroot/wt > /dev/null
86 	ret=$?
87 	if [ $ret -ne 0 ]; then
88 		test_done "$testroot" "$ret"
89 		return 1
90 	fi
91 
92 	echo "modified alpha" > $testroot/wt/alpha
93 	echo "modified zeta" > $testroot/wt/epsilon/zeta
94 
95 	(cd $testroot/wt && \
96 		got commit -m 'test commit_subdir' epsilon > $testroot/stdout)
97 
98 	local head_rev=`git_show_head $testroot/repo`
99 	echo "M  epsilon/zeta" >> $testroot/stdout.expected
100 	echo "Created commit $head_rev" >> $testroot/stdout.expected
101 
102 	cmp -s $testroot/stdout.expected $testroot/stdout
103 	ret=$?
104 	if [ $ret -ne 0 ]; then
105 		diff -u $testroot/stdout.expected $testroot/stdout
106 	fi
107 	test_done "$testroot" "$ret"
108 }
109 
110 test_commit_single_file() {
111 	local testroot=`test_init commit_single_file`
112 
113 	got checkout $testroot/repo $testroot/wt > /dev/null
114 	ret=$?
115 	if [ $ret -ne 0 ]; then
116 		test_done "$testroot" "$ret"
117 		return 1
118 	fi
119 
120 	echo "modified alpha" > $testroot/wt/alpha
121 	echo "modified zeta" > $testroot/wt/epsilon/zeta
122 
123 	(cd $testroot/wt && got commit -m 'changed zeta' epsilon/zeta \
124 		> $testroot/stdout)
125 
126 	local head_rev=`git_show_head $testroot/repo`
127 	echo "M  epsilon/zeta" >> $testroot/stdout.expected
128 	echo "Created commit $head_rev" >> $testroot/stdout.expected
129 
130 	cmp -s $testroot/stdout.expected $testroot/stdout
131 	ret=$?
132 	if [ $ret -ne 0 ]; then
133 		diff -u $testroot/stdout.expected $testroot/stdout
134 	fi
135 	test_done "$testroot" "$ret"
136 }
137 
138 test_commit_out_of_date() {
139 	local testroot=`test_init commit_out_of_date`
140 	local first_commit=`git_show_head $testroot/repo`
141 
142 	got checkout $testroot/repo $testroot/wt > /dev/null
143 	ret=$?
144 	if [ $ret -ne 0 ]; then
145 		test_done "$testroot" "$ret"
146 		return 1
147 	fi
148 
149 	echo "modified alpha" > $testroot/repo/alpha
150 	git_commit $testroot/repo -m "modified alpha"
151 
152 	echo "modified alpha" > $testroot/wt/alpha
153 
154 	(cd $testroot/wt && got commit -m 'test commit_out_of_date' \
155 		> $testroot/stdout 2> $testroot/stderr)
156 
157 	echo -n > $testroot/stdout.expected
158 	echo "got: work tree must be updated before these" \
159 		"changes can be committed" > $testroot/stderr.expected
160 
161 	cmp -s $testroot/stdout.expected $testroot/stdout
162 	ret=$?
163 	if [ $ret -ne 0 ]; then
164 		diff -u $testroot/stdout.expected $testroot/stdout
165 		test_done "$testroot" "$ret"
166 		return 1
167 	fi
168 
169 	cmp -s $testroot/stderr.expected $testroot/stderr
170 	ret=$?
171 	if [ $ret -ne 0 ]; then
172 		diff -u $testroot/stderr.expected $testroot/stderr
173 		test_done "$testroot" "$ret"
174 		return 1
175 	fi
176 
177 	echo "alpha" > $testroot/repo/alpha
178 	git_commit $testroot/repo -m "reset alpha contents"
179 	(cd $testroot/wt && got update -c $first_commit > /dev/null)
180 
181 	echo "modified alpha" > $testroot/wt/alpha
182 
183 	(cd $testroot/wt && got commit -m 'changed alpha ' > $testroot/stdout)
184 	ret=$?
185 	if [ $ret -ne 0 ]; then
186 		echo "commit failed unexpectedly" >&2
187 		test_done "$testroot" "1"
188 		return 1
189 	fi
190 
191 	local head_rev=`git_show_head $testroot/repo`
192 	echo "M  alpha" > $testroot/stdout.expected
193 	echo "Created commit $head_rev" >> $testroot/stdout.expected
194 	cmp -s $testroot/stdout.expected $testroot/stdout
195 	ret=$?
196 	if [ $ret -ne 0 ]; then
197 		diff -u $testroot/stdout.expected $testroot/stdout
198 	fi
199 	test_done "$testroot" "$ret"
200 }
201 
202 test_commit_added_subdirs() {
203 	local testroot=`test_init commit_added_subdirs`
204 
205 	got checkout $testroot/repo $testroot/wt > /dev/null
206 	ret=$?
207 	if [ $ret -ne 0 ]; then
208 		test_done "$testroot" "$ret"
209 		return 1
210 	fi
211 
212 	mkdir -p $testroot/wt/d
213 	echo "new file" > $testroot/wt/d/new
214 	echo "new file 2" > $testroot/wt/d/new2
215 	mkdir -p $testroot/wt/d/f
216 	echo "new file 3" > $testroot/wt/d/f/new3
217 	mkdir -p $testroot/wt/d/f/g
218 	echo "new file 4" > $testroot/wt/d/f/g/new4
219 
220 	(cd $testroot/wt && got add $testroot/wt/*/new* \
221 		$testroot/wt/*/*/new* $testroot/wt/*/*/*/new* > /dev/null)
222 
223 	(cd $testroot/wt && got commit -m 'test commit_added_subdirs' \
224 		> $testroot/stdout 2> $testroot/stderr)
225 
226 	local head_rev=`git_show_head $testroot/repo`
227 	echo "A  d/f/g/new4" > $testroot/stdout.expected
228 	echo "A  d/f/new3" >> $testroot/stdout.expected
229 	echo "A  d/new" >> $testroot/stdout.expected
230 	echo "A  d/new2" >> $testroot/stdout.expected
231 	echo "Created commit $head_rev" >> $testroot/stdout.expected
232 
233 	cmp -s $testroot/stdout.expected $testroot/stdout
234 	ret=$?
235 	if [ $ret -ne 0 ]; then
236 		diff -u $testroot/stdout.expected $testroot/stdout
237 	fi
238 	test_done "$testroot" "$ret"
239 }
240 
241 test_commit_deleted_subdirs() {
242 	local testroot=`test_init commit_deleted_subdirs`
243 
244 	got checkout $testroot/repo $testroot/wt > /dev/null
245 	ret=$?
246 	if [ $ret -ne 0 ]; then
247 		test_done "$testroot" "$ret"
248 		return 1
249 	fi
250 
251 	(cd $testroot/wt && \
252 		got rm -R $testroot/wt/epsilon $testroot/wt/gamma >/dev/null)
253 
254 	(cd $testroot/wt && got commit -m 'test commit_deleted_subdirs' \
255 		> $testroot/stdout 2> $testroot/stderr)
256 
257 	local head_rev=`git_show_head $testroot/repo`
258 	echo "D  epsilon/zeta" > $testroot/stdout.expected
259 	echo "D  gamma/delta" >> $testroot/stdout.expected
260 	echo "Created commit $head_rev" >> $testroot/stdout.expected
261 
262 	cmp -s $testroot/stdout.expected $testroot/stdout
263 	ret=$?
264 	if [ $ret -ne 0 ]; then
265 		diff -u $testroot/stdout.expected $testroot/stdout
266 		test_done "$testroot" "$ret"
267 		return 1
268 	fi
269 
270 	got tree -r $testroot/repo > $testroot/stdout
271 
272 	echo "alpha" > $testroot/stdout.expected
273 	echo "beta" >> $testroot/stdout.expected
274 
275 	cmp -s $testroot/stdout.expected $testroot/stdout
276 	ret=$?
277 	if [ $ret -ne 0 ]; then
278 		diff -u $testroot/stdout.expected $testroot/stdout
279 	fi
280 	test_done "$testroot" "$ret"
281 }
282 
283 test_commit_rejects_conflicted_file() {
284 	local testroot=`test_init commit_rejects_conflicted_file`
285 
286 	local initial_rev=`git_show_head $testroot/repo`
287 
288 	got checkout $testroot/repo $testroot/wt > /dev/null
289 	ret=$?
290 	if [ $ret -ne 0 ]; then
291 		test_done "$testroot" "$ret"
292 		return 1
293 	fi
294 
295 	echo "modified alpha" > $testroot/wt/alpha
296 	(cd $testroot/wt && got commit -m "modified alpha" >/dev/null)
297 	local commit_id1=`git_show_head $testroot/repo`
298 
299 	(cd $testroot/wt && got update -c $initial_rev > /dev/null)
300 
301 	echo "modified alpha, too" > $testroot/wt/alpha
302 
303 	echo "C  alpha" > $testroot/stdout.expected
304 	echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
305 	git_show_head $testroot/repo >> $testroot/stdout.expected
306 	echo >> $testroot/stdout.expected
307 	echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
308 
309 	(cd $testroot/wt && got update > $testroot/stdout)
310 
311 	cmp -s $testroot/stdout.expected $testroot/stdout
312 	ret=$?
313 	if [ $ret -ne 0 ]; then
314 		diff -u $testroot/stdout.expected $testroot/stdout
315 		test_done "$testroot" "$ret"
316 		return 1
317 	fi
318 
319 	(cd $testroot/wt && got commit -m 'commit it' > $testroot/stdout \
320 		2> $testroot/stderr)
321 	ret=$?
322 	if [ $ret -eq 0 ]; then
323 		echo "got commit succeeded unexpectedly"
324 		test_done "$testroot" "$ret"
325 		return 1
326 	fi
327 
328 	echo "C  alpha" > $testroot/stdout.expected
329 	echo "got: cannot commit file in conflicted status" \
330 		> $testroot/stderr.expected
331 
332 	cmp -s $testroot/stdout.expected $testroot/stdout
333 	ret=$?
334 	if [ $ret -ne 0 ]; then
335 		diff -u $testroot/stdout.expected $testroot/stdout
336 		test_done "$testroot" "$ret"
337 		return 1
338 	fi
339 	cmp -s $testroot/stderr.expected $testroot/stderr
340 	ret=$?
341 	if [ $ret -ne 0 ]; then
342 		diff -u $testroot/stderr.expected $testroot/stderr
343 		test_done "$testroot" "$ret"
344 		return 1
345 	fi
346 
347 	(cd $testroot/wt && got commit -C -m 'commit it' > $testroot/stdout \
348 		2> $testroot/stderr)
349 	ret=$?
350 	if [ $ret -ne 0 ]; then
351 		echo "got commit failed unexpectedly"
352 		test_done "$testroot" "$ret"
353 		return 1
354 	fi
355 
356 	# make sure the conflicted commit produces a diff
357 	local conflict_commit=`git_show_head $testroot/repo`
358 	local blob_minus=`got tree -r $testroot/repo -c $commit_id1 -i | \
359 	    grep 'alpha$' | cut -d' ' -f1`
360 	local blob_plus=`got tree -r $testroot/repo -c $conflict_commit -i | \
361 	    grep 'alpha$' | cut -d' ' -f1`
362 
363 	echo -n > $testroot/stderr.expected
364 	cmp -s $testroot/stderr.expected $testroot/stderr
365 	ret=$?
366 	if [ $ret -ne 0 ]; then
367 		diff -u $testroot/stderr.expected $testroot/stderr
368 		test_done "$testroot" "$ret"
369 		return 1
370 	fi
371 
372 	(cd $testroot/wt && got diff -c master > $testroot/stdout)
373 
374 	echo -n > $testroot/stdout.expected
375 	cat > $testroot/stdout.expected <<EOF
376 diff $commit_id1 refs/heads/master
377 commit - $commit_id1
378 commit + $conflict_commit
379 blob - $blob_minus
380 blob + $blob_plus
381 --- alpha
382 +++ alpha
383 @@ -1 +1,7 @@
384 +<<<<<<< merged change: commit $commit_id1
385  modified alpha
386 +||||||| 3-way merge base: commit $initial_rev
387 +alpha
388 +=======
389 +modified alpha, too
390 +>>>>>>>
391 EOF
392 
393 	cmp -s $testroot/stdout.expected $testroot/stdout
394 	ret=$?
395 	if [ $ret -ne 0 ]; then
396 		diff -u $testroot/stdout.expected $testroot/stdout
397 		test_done "$testroot" "$ret"
398 		return 1
399 	fi
400 
401 	(cd $testroot/wt && got status > $testroot/stdout)
402 
403 	echo -n > $testroot/stdout.expected
404 	cmp -s $testroot/stdout.expected $testroot/stdout
405 	ret=$?
406 	if [ $ret -ne 0 ]; then
407 		diff -u $testroot/stdout.expected $testroot/stdout
408 	fi
409 	test_done "$testroot" "$ret"
410 }
411 
412 test_commit_single_file_multiple() {
413 	local testroot=`test_init commit_single_file_multiple`
414 
415 	got checkout $testroot/repo $testroot/wt > /dev/null
416 	ret=$?
417 	if [ $ret -ne 0 ]; then
418 		test_done "$testroot" "$ret"
419 		return 1
420 	fi
421 
422 	for i in 1 2 3 4; do
423 		echo "modified alpha" >> $testroot/wt/alpha
424 
425 		(cd $testroot/wt && \
426 			got commit -m "changed alpha" > $testroot/stdout)
427 
428 		local head_rev=`git_show_head $testroot/repo`
429 		echo "M  alpha" > $testroot/stdout.expected
430 		echo "Created commit $head_rev" >> $testroot/stdout.expected
431 
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 	done
440 
441 	test_done "$testroot" "0"
442 }
443 
444 test_commit_added_and_modified_in_same_dir() {
445 	local testroot=`test_init commit_added_and_modified_in_same_dir`
446 
447 	got checkout $testroot/repo $testroot/wt > /dev/null
448 	ret=$?
449 	if [ $ret -ne 0 ]; then
450 		test_done "$testroot" "$ret"
451 		return 1
452 	fi
453 
454 	echo "modified zeta" > $testroot/wt/epsilon/zeta
455 	echo "new file" > $testroot/wt/epsilon/new
456 	(cd $testroot/wt && got add epsilon/new >/dev/null)
457 
458 	(cd $testroot/wt && got commit \
459 		-m 'added and modified in same dir' > $testroot/stdout \
460 		2> $testroot/stderr)
461 
462 	local head_rev=`git_show_head $testroot/repo`
463 	echo "A  epsilon/new" > $testroot/stdout.expected
464 	echo "M  epsilon/zeta" >> $testroot/stdout.expected
465 	echo "Created commit $head_rev" >> $testroot/stdout.expected
466 
467 	cmp -s $testroot/stdout.expected $testroot/stdout
468 	ret=$?
469 	if [ $ret -ne 0 ]; then
470 		diff -u $testroot/stdout.expected $testroot/stdout
471 	fi
472 	test_done "$testroot" "$ret"
473 }
474 
475 test_commit_path_prefix() {
476 	local testroot=`test_init commit_path_prefix`
477 	local commit1=`git_show_head $testroot/repo`
478 
479 	got checkout -p gamma $testroot/repo $testroot/wt > /dev/null
480 	ret=$?
481 	if [ $ret -ne 0 ]; then
482 		test_done "$testroot" "$ret"
483 		return 1
484 	fi
485 
486 	echo "modified delta" > $testroot/wt/delta
487 
488 	(cd $testroot/wt && got commit -m 'changed gamma/delta' > $testroot/stdout)
489 
490 	local commit2=`git_show_head $testroot/repo`
491 	echo "M  delta" > $testroot/stdout.expected
492 	echo "Created commit $commit2" >> $testroot/stdout.expected
493 
494 	cmp -s $testroot/stdout.expected $testroot/stdout
495 	ret=$?
496 	if [ $ret -ne 0 ]; then
497 		diff -u $testroot/stdout.expected $testroot/stdout
498 		test_done "$testroot" "$ret"
499 		return 1
500 	fi
501 
502 	echo "diff $commit1 $commit2" > $testroot/stdout.expected
503 	echo "commit - $commit1" >> $testroot/stdout.expected
504 	echo "commit + $commit2" >> $testroot/stdout.expected
505 	echo -n 'blob - ' >> $testroot/stdout.expected
506 	got tree -r $testroot/repo -c $commit1 -i gamma | grep 'delta$' \
507 		| cut -d' ' -f 1 >> $testroot/stdout.expected
508 	echo -n 'blob + ' >> $testroot/stdout.expected
509 	got tree -r $testroot/repo -c $commit2 -i gamma | grep 'delta$' | \
510 		cut -d' ' -f 1 >> $testroot/stdout.expected
511 	echo '--- gamma/delta' >> $testroot/stdout.expected
512 	echo '+++ gamma/delta' >> $testroot/stdout.expected
513 	echo '@@ -1 +1 @@' >> $testroot/stdout.expected
514 	echo '-delta' >> $testroot/stdout.expected
515 	echo '+modified delta' >> $testroot/stdout.expected
516 
517 	got diff -r $testroot/repo $commit1 $commit2 > $testroot/stdout
518 	cmp -s $testroot/stdout.expected $testroot/stdout
519 	ret=$?
520 	if [ $ret -ne 0 ]; then
521 		diff -u $testroot/stdout.expected $testroot/stdout
522 		test_done "$testroot" "$ret"
523 		return 1
524 	fi
525 
526 	(cd $testroot/wt && got rm delta > /dev/null)
527 	echo new > $testroot/wt/new
528 	(cd $testroot/wt && got add new > /dev/null)
529 
530 	(cd $testroot/wt && got commit -m 'remove gamma/delta; add gamma/new' \
531 		> $testroot/stdout)
532 
533 	local commit3=`git_show_head $testroot/repo`
534 	echo "A  new" > $testroot/stdout.expected
535 	echo "D  delta" >> $testroot/stdout.expected
536 	echo "Created commit $commit3" >> $testroot/stdout.expected
537 
538 	cmp -s $testroot/stdout.expected $testroot/stdout
539 	ret=$?
540 	if [ $ret -ne 0 ]; then
541 		diff -u $testroot/stdout.expected $testroot/stdout
542 		test_done "$testroot" "$ret"
543 		return 1
544 	fi
545 
546 	echo "diff $commit2 $commit3" > $testroot/stdout.expected
547 	echo "commit - $commit2" >> $testroot/stdout.expected
548 	echo "commit + $commit3" >> $testroot/stdout.expected
549 	echo -n 'blob - ' >> $testroot/stdout.expected
550 	got tree -r $testroot/repo -c $commit2 -i gamma | grep 'delta$' \
551 		| cut -d' ' -f 1 | sed -e 's/$/ (mode 644)/' \
552 		>> $testroot/stdout.expected
553 	echo 'blob + /dev/null' >> $testroot/stdout.expected
554 	echo '--- gamma/delta' >> $testroot/stdout.expected
555 	echo '+++ /dev/null' >> $testroot/stdout.expected
556 	echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
557 	echo '-modified delta' >> $testroot/stdout.expected
558 	echo 'blob - /dev/null' >> $testroot/stdout.expected
559 	echo -n 'blob + ' >> $testroot/stdout.expected
560 	got tree -r $testroot/repo -c $commit3 -i gamma | grep 'new$' | \
561 		cut -d' ' -f 1 | sed -e 's/$/ (mode 644)/' \
562 		>> $testroot/stdout.expected
563 	echo '--- /dev/null' >> $testroot/stdout.expected
564 	echo '+++ gamma/new' >> $testroot/stdout.expected
565 	echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
566 	echo '+new' >> $testroot/stdout.expected
567 
568 	got diff -r $testroot/repo $commit2 $commit3 > $testroot/stdout
569 	cmp -s $testroot/stdout.expected $testroot/stdout
570 	ret=$?
571 	if [ $ret -ne 0 ]; then
572 		diff -u $testroot/stdout.expected $testroot/stdout
573 	fi
574 	test_done "$testroot" "$ret"
575 	return "$ret"
576 }
577 
578 test_commit_dir_path() {
579 	local testroot=`test_init commit_dir_path`
580 
581 	got checkout $testroot/repo $testroot/wt > /dev/null
582 	ret=$?
583 	if [ $ret -ne 0 ]; then
584 		test_done "$testroot" "$ret"
585 		return 1
586 	fi
587 
588 	echo "modified alpha" > $testroot/wt/alpha
589 	echo "modified zeta" > $testroot/wt/epsilon/zeta
590 
591 	(cd $testroot/wt && got commit -m 'changed zeta' epsilon \
592 		> $testroot/stdout)
593 
594 	local head_rev=`git_show_head $testroot/repo`
595 	echo "M  epsilon/zeta" >> $testroot/stdout.expected
596 	echo "Created commit $head_rev" >> $testroot/stdout.expected
597 
598 	cmp -s $testroot/stdout.expected $testroot/stdout
599 	ret=$?
600 	if [ $ret -ne 0 ]; then
601 		diff -u $testroot/stdout.expected $testroot/stdout
602 		test_done "$testroot" "$ret"
603 		return 1
604 	fi
605 
606 	echo "M  alpha" > $testroot/stdout.expected
607 	(cd $testroot/wt && got status > $testroot/stdout)
608 	cmp -s $testroot/stdout.expected $testroot/stdout
609 	ret=$?
610 	if [ $ret -ne 0 ]; then
611 		diff -u $testroot/stdout.expected $testroot/stdout
612 	fi
613 	test_done "$testroot" "$ret"
614 }
615 
616 test_commit_selected_paths() {
617 	local testroot=`test_init commit_selected_paths`
618 
619 	got checkout $testroot/repo $testroot/wt > /dev/null
620 	ret=$?
621 	if [ $ret -ne 0 ]; then
622 		test_done "$testroot" "$ret"
623 		return 1
624 	fi
625 
626 	echo "modified alpha" > $testroot/wt/alpha
627 	echo "modified delta" > $testroot/wt/gamma/delta
628 	echo "modified zeta" > $testroot/wt/epsilon/zeta
629 	(cd $testroot/wt && got rm beta >/dev/null)
630 	echo "new file" > $testroot/wt/new
631 	(cd $testroot/wt && got add new >/dev/null)
632 
633 	(cd $testroot/wt && got commit -m 'many paths' nonexistent alpha \
634 		> $testroot/stdout 2> $testroot/stderr)
635 	ret=$?
636 	if [ $ret -eq 0 ]; then
637 		echo "commit succeeded unexpectedly" >&2
638 		test_done "$testroot" "1"
639 		return 1
640 	fi
641 	echo "got: nonexistent: bad path" > $testroot/stderr.expected
642 
643 	cmp -s $testroot/stderr.expected $testroot/stderr
644 	ret=$?
645 	if [ $ret -ne 0 ]; then
646 		diff -u $testroot/stderr.expected $testroot/stderr
647 		test_done "$testroot" "$ret"
648 		return 1
649 	fi
650 
651 	(cd $testroot/wt && got commit -m 'many paths' \
652 		beta new gamma > $testroot/stdout)
653 
654 	local head_rev=`git_show_head $testroot/repo`
655 	echo "A  new" > $testroot/stdout.expected
656 	echo "D  beta" >> $testroot/stdout.expected
657 	echo "M  gamma/delta" >> $testroot/stdout.expected
658 	echo "Created commit $head_rev" >> $testroot/stdout.expected
659 
660 	cmp -s $testroot/stdout.expected $testroot/stdout
661 	ret=$?
662 	if [ $ret -ne 0 ]; then
663 		diff -u $testroot/stdout.expected $testroot/stdout
664 	fi
665 	test_done "$testroot" "$ret"
666 }
667 
668 test_commit_outside_refs_heads() {
669 	local testroot=`test_init commit_outside_refs_heads`
670 
671 	got ref -r $testroot/repo -c master refs/remotes/origin/master
672 
673 	got checkout -b refs/remotes/origin/master \
674 	    $testroot/repo $testroot/wt > /dev/null
675 	ret=$?
676 	if [ $ret -ne 0 ]; then
677 		test_done "$testroot" "$ret"
678 		return 1
679 	fi
680 
681 	echo "modified alpha" > $testroot/wt/alpha
682 
683 	(cd $testroot/wt && got commit -m 'change alpha' \
684 		> $testroot/stdout 2> $testroot/stderr)
685 	ret=$?
686 	if [ $ret -eq 0 ]; then
687 		echo "commit succeeded unexpectedly" >&2
688 		test_done "$testroot" "1"
689 		return 1
690 	fi
691 
692 	echo -n > $testroot/stdout.expected
693 	cmp -s $testroot/stdout.expected $testroot/stdout
694 	ret=$?
695 	if [ $ret -ne 0 ]; then
696 		diff -u $testroot/stdout.expected $testroot/stdout
697 		test_done "$testroot" "$ret"
698 		return 1
699 	fi
700 
701 	echo -n "got: will not commit to a branch outside the " \
702 		> $testroot/stderr.expected
703 	echo '"refs/heads/" reference namespace' \
704 		>> $testroot/stderr.expected
705 	cmp -s $testroot/stderr.expected $testroot/stderr
706 	ret=$?
707 	if [ $ret -ne 0 ]; then
708 		diff -u $testroot/stderr.expected $testroot/stderr
709 	fi
710 	test_done "$testroot" "$ret"
711 }
712 
713 test_commit_no_email() {
714 	local testroot=`test_init commit_no_email`
715 	local errmsg=""
716 
717 	errmsg="commit author's email address is required for"
718 	errmsg="$errmsg compatibility with Git"
719 
720 	got checkout $testroot/repo $testroot/wt > /dev/null
721 	ret=$?
722 	if [ $ret -ne 0 ]; then
723 		test_done "$testroot" "$ret"
724 		return 1
725 	fi
726 
727 	echo "modified alpha" > $testroot/wt/alpha
728 	(cd $testroot/wt && env GOT_AUTHOR=":flan_hacker:" \
729 		got commit -m 'test no email' > $testroot/stdout \
730 		2> $testroot/stderr)
731 
732 	printf "got: :flan_hacker:: %s\n" "$errmsg" > $testroot/stderr.expected
733 	cmp -s $testroot/stderr.expected $testroot/stderr
734 	ret=$?
735 	if [ $ret -ne 0 ]; then
736 		diff -u $testroot/stderr.expected $testroot/stderr
737 		test_done "$testroot" "$ret"
738 		return 1
739 	fi
740 
741 	echo -n > $testroot/stdout.expected
742 	cmp -s $testroot/stdout.expected $testroot/stdout
743 	ret=$?
744 	if [ $ret -ne 0 ]; then
745 		diff -u $testroot/stdout.expected $testroot/stdout
746 		test_done "$testroot" $ret
747 		return 1
748 	fi
749 
750 	# try again with a newline inside the email
751 	(cd $testroot/wt \
752 		&& FS=' ' env GOT_AUTHOR="$(printf "Flan <hack\ner>")" \
753 		got commit -m 'test invalid email' > $testroot/stdout \
754 		2> $testroot/stderr)
755 
756 	printf "got: Flan <hack\ner>: %s\n" "$errmsg" \
757 		> $testroot/stderr.expected
758 	cmp -s $testroot/stderr.expected $testroot/stderr
759 	ret=$?
760 	if [ $ret -ne 0 ]; then
761 		diff -u $testroot/stderr.expected $testroot/stderr
762 		test_done "$testroot" $ret
763 		return 1
764 	fi
765 
766 	echo -n > $testroot/stdout.expected
767 	cmp -s $testroot/stdout.expected $testroot/stdout
768 	ret=$?
769 	if [ $ret -ne 0 ]; then
770 		diff -u $testroot/stdout.expected $testroot/stdout
771 		test_done "$testroot" $ret
772 		return 1
773 	fi
774 
775 	# try again with a < inside the email
776 	(cd $testroot/wt && env GOT_AUTHOR="$(printf "Flan <ha<ker>")" \
777 		got commit -m 'test invalid email' > $testroot/stdout \
778 		2> $testroot/stderr)
779 
780 	printf "got: Flan <ha<ker>: %s\n" "$errmsg" > $testroot/stderr.expected
781 	cmp -s $testroot/stderr.expected $testroot/stderr
782 	ret=$?
783 	if [ $ret -ne 0 ]; then
784 		diff -u $testroot/stderr.expected $testroot/stderr
785 		test_done "$testroot" $ret
786 		return 1
787 	fi
788 
789 	echo -n > $testroot/stdout.expected
790 	cmp -s $testroot/stdout.expected $testroot/stdout
791 	ret=$?
792 	if [ $ret -ne 0 ]; then
793 		diff -u $testroot/stdout.expected $testroot/stdout
794 	fi
795 	test_done "$testroot" $ret
796 }
797 
798 test_commit_tree_entry_sorting() {
799 	local testroot=`test_init commit_tree_entry_sorting`
800 
801 	got checkout $testroot/repo $testroot/wt > /dev/null
802 	ret=$?
803 	if [ $ret -ne 0 ]; then
804 		test_done "$testroot" "$ret"
805 		return 1
806 	fi
807 
808 	# Git's index gets corrupted when tree entries are written in the
809 	# order defined by got_path_cmp() rather than Git's own ordering.
810 	# Create a new tree where a directory "got" and a file "got-version"
811 	# would sort in the wrong order according to Git's opinion.
812 	mkdir $testroot/wt/got
813 	touch $testroot/wt/got/foo
814 	echo foo > $testroot/wt/got-version
815 	echo zzz > $testroot/wt/zzz
816 	(cd $testroot/wt && got add got-version got/foo zzz > /dev/null)
817 
818 	(cd $testroot/wt && got commit -m 'test' > /dev/null)
819 
820 	# Let git-fsck verify the newly written tree to make sure Git is happy
821 	(cd $testroot/repo && git fsck --strict  \
822 		> $testroot/fsck.stdout 2> $testroot/fsck.stderr)
823 	ret=$?
824 	test_done "$testroot" "$ret"
825 }
826 
827 test_commit_cmdline_author() {
828 	local testroot=`test_init commit_cmdline_author`
829 
830 	got checkout $testroot/repo $testroot/wt > /dev/null
831 	ret=$?
832 	if [ $ret -ne 0 ]; then
833 		test_done "$testroot" $ret
834 		return 1
835 	fi
836 
837 	echo "modified alpha" > $testroot/wt/alpha
838 
839 	local author="Foo <foo@example.com>"
840 	(cd $testroot/wt && got commit -A "$author" -m 'edit alpha') \
841 		> /dev/null
842 	ret=$?
843 	if [ $ret -ne 0 ]; then
844 		test_done "$testroot" $ret
845 		return 1
846 	fi
847 
848 	(cd $testroot/repo && got log -l1 | egrep '^(from|via):') \
849 		> $testroot/stdout
850 	ret=$?
851 	if [ $ret -ne 0 ]; then
852 		test_done "$testroot" $ret
853 		return 1
854 	fi
855 
856 	echo "from: $author" > $testroot/stdout.expected
857 	echo "via: $GOT_AUTHOR" >> $testroot/stdout.expected
858 	cmp -s $testroot/stdout.expected $testroot/stdout
859 	ret=$?
860 	if [ $ret -ne 0 ]; then
861 		diff -u $testroot/stdout.expected $testroot/stdout
862 	fi
863 	test_done "$testroot" $ret
864 }
865 
866 test_commit_gotconfig_author() {
867 	local testroot=`test_init commit_gotconfig_author`
868 
869 	got checkout $testroot/repo $testroot/wt > /dev/null
870 	ret=$?
871 	if [ $ret -ne 0 ]; then
872 		test_done "$testroot" "$ret"
873 		return 1
874 	fi
875 	echo 'author "Flan Luck <flan_luck@openbsd.org>"' \
876 		> $testroot/repo/.git/got.conf
877 
878 	echo "modified alpha" > $testroot/wt/alpha
879 	(cd $testroot/wt && got commit -m 'test gotconfig author' > /dev/null)
880 	ret=$?
881 	if [ $ret -ne 0 ]; then
882 		test_done "$testroot" "$ret"
883 		return 1
884 	fi
885 
886 	(cd $testroot/repo && got log -l1 | grep ^from: > $testroot/stdout)
887 	ret=$?
888 	if [ $ret -ne 0 ]; then
889 		test_done "$testroot" "$ret"
890 		return 1
891 	fi
892 
893 	echo "from: Flan Luck <flan_luck@openbsd.org>" \
894 		> $testroot/stdout.expected
895 	cmp -s $testroot/stdout.expected $testroot/stdout
896 	ret=$?
897 	if [ $ret -ne 0 ]; then
898 		diff -u $testroot/stdout.expected $testroot/stdout
899 	fi
900 	test_done "$testroot" "$ret"
901 }
902 
903 test_commit_gotconfig_worktree_author() {
904 	local testroot=`test_init commit_gotconfig_worktree_author`
905 
906 	got checkout $testroot/repo $testroot/wt > /dev/null
907 	ret=$?
908 	if [ $ret -ne 0 ]; then
909 		test_done "$testroot" "$ret"
910 		return 1
911 	fi
912 	echo 'author "Flan Luck <flan_luck@openbsd.org>"' \
913 		> $testroot/repo/.git/got.conf
914 	echo 'author "Flan Squee <flan_squee@openbsd.org>"' \
915 		> $testroot/wt/.got/got.conf
916 
917 	echo "modified alpha" > $testroot/wt/alpha
918 	(cd $testroot/wt && got commit -m 'test gotconfig author' > /dev/null)
919 	ret=$?
920 	if [ $ret -ne 0 ]; then
921 		test_done "$testroot" "$ret"
922 		return 1
923 	fi
924 
925 	(cd $testroot/repo && got log -l1 | grep ^from: > $testroot/stdout)
926 	ret=$?
927 	if [ $ret -ne 0 ]; then
928 		test_done "$testroot" "$ret"
929 		return 1
930 	fi
931 
932 	echo "from: Flan Squee <flan_squee@openbsd.org>" \
933 		> $testroot/stdout.expected
934 	cmp -s $testroot/stdout.expected $testroot/stdout
935 	ret=$?
936 	if [ $ret -ne 0 ]; then
937 		diff -u $testroot/stdout.expected $testroot/stdout
938 	fi
939 	test_done "$testroot" "$ret"
940 }
941 
942 test_commit_gitconfig_author() {
943 	local testroot=`test_init commit_gitconfig_author`
944 
945 	got checkout $testroot/repo $testroot/wt > /dev/null
946 	ret=$?
947 	if [ $ret -ne 0 ]; then
948 		test_done "$testroot" "$ret"
949 		return 1
950 	fi
951 
952 	(cd $testroot/repo && git config user.name 'Flan Luck')
953 	(cd $testroot/repo && git config user.email 'flan_luck@openbsd.org')
954 
955 	echo "modified alpha" > $testroot/wt/alpha
956 
957 	# unset in a subshell to avoid affecting our environment
958 	(unset GOT_IGNORE_GITCONFIG && cd $testroot/wt && \
959 		 got commit -m 'test gitconfig author' > /dev/null)
960 	ret=$?
961 	if [ $ret -ne 0 ]; then
962 		test_done "$testroot" "$ret"
963 		return 1
964 	fi
965 
966 	(cd $testroot/repo && got log -l1 | grep ^from: > $testroot/stdout)
967 	ret=$?
968 	if [ $ret -ne 0 ]; then
969 		test_done "$testroot" "$ret"
970 		return 1
971 	fi
972 
973 	echo "from: Flan Luck <flan_luck@openbsd.org>" \
974 		> $testroot/stdout.expected
975 	cmp -s $testroot/stdout.expected $testroot/stdout
976 	ret=$?
977 	if [ $ret -ne 0 ]; then
978 		diff -u $testroot/stdout.expected $testroot/stdout
979 	fi
980 	test_done "$testroot" "$ret"
981 }
982 
983 test_commit_xbit_change() {
984 	local testroot=`test_init commit_xbit_change`
985 
986 	got checkout $testroot/repo $testroot/wt > /dev/null
987 	ret=$?
988 	if [ $ret -ne 0 ]; then
989 		test_done "$testroot" "$ret"
990 		return 1
991 	fi
992 
993 	chmod +x $testroot/wt/alpha
994 
995 	echo 'm  alpha' > $testroot/stdout.expected
996 	(cd $testroot/wt && got status > $testroot/stdout)
997 
998 	cmp -s $testroot/stdout.expected $testroot/stdout
999 	ret=$?
1000 	if [ $ret -ne 0 ]; then
1001 		diff -u $testroot/stdout.expected $testroot/stdout
1002 		test_done "$testroot" "$ret"
1003 		return 1
1004 	fi
1005 
1006 	(cd $testroot/wt && got commit -mx > $testroot/stdout)
1007 	ret=$?
1008 	if [ $ret -ne 0 ]; then
1009 		echo "got commit failed unexpectedly"
1010 		test_done "$testroot" "$ret"
1011 		return 1
1012 	fi
1013 
1014 	local commit_id=`git_show_head $testroot/repo`
1015 	echo 'm  alpha' > $testroot/stdout.expected
1016 	echo "Created commit $commit_id" >> $testroot/stdout.expected
1017 	cmp -s $testroot/stdout.expected $testroot/stdout
1018 	ret=$?
1019 	if [ $ret -ne 0 ]; then
1020 		diff -u $testroot/stdout.expected $testroot/stdout
1021 		test_done "$testroot" "$ret"
1022 		return 1
1023 	fi
1024 
1025 	(cd $testroot/wt && got status > $testroot/stdout)
1026 
1027 	echo -n > $testroot/stdout.expected
1028 	cmp -s $testroot/stdout.expected $testroot/stdout
1029 	ret=$?
1030 	if [ $ret -ne 0 ]; then
1031 		diff -u $testroot/stdout.expected $testroot/stdout
1032 		test_done "$testroot" "$ret"
1033 		return 1
1034 	fi
1035 
1036 	chmod -x $testroot/wt/alpha
1037 
1038 	echo 'm  alpha' > $testroot/stdout.expected
1039 	(cd $testroot/wt && got status > $testroot/stdout)
1040 
1041 	cmp -s $testroot/stdout.expected $testroot/stdout
1042 	ret=$?
1043 	if [ $ret -ne 0 ]; then
1044 		diff -u $testroot/stdout.expected $testroot/stdout
1045 		test_done "$testroot" "$ret"
1046 		return 1
1047 	fi
1048 
1049 	(cd $testroot/wt && got commit -mx > $testroot/stdout)
1050 	ret=$?
1051 	if [ $ret -ne 0 ]; then
1052 		echo "got commit failed unexpectedly"
1053 		test_done "$testroot" "$ret"
1054 		return 1
1055 	fi
1056 
1057 	local commit_id=`git_show_head $testroot/repo`
1058 	echo 'm  alpha' > $testroot/stdout.expected
1059 	echo "Created commit $commit_id" >> $testroot/stdout.expected
1060 	cmp -s $testroot/stdout.expected $testroot/stdout
1061 	ret=$?
1062 	if [ $ret -ne 0 ]; then
1063 		diff -u $testroot/stdout.expected $testroot/stdout
1064 		test_done "$testroot" "$ret"
1065 		return 1
1066 	fi
1067 
1068 	chmod +x $testroot/wt/alpha
1069 
1070 	echo 'm  alpha' > $testroot/stdout.expected
1071 	(cd $testroot/wt && got status > $testroot/stdout)
1072 
1073 	cmp -s $testroot/stdout.expected $testroot/stdout
1074 	ret=$?
1075 	if [ $ret -ne 0 ]; then
1076 		diff -u $testroot/stdout.expected $testroot/stdout
1077 	fi
1078 	test_done "$testroot" "$ret"
1079 }
1080 
1081 commit_check_mode() {
1082 	local mode="$1"
1083 	local expected_mode="$2"
1084 
1085 	chmod 644 $testroot/wt/alpha
1086 	echo a >> $testroot/wt/alpha
1087 	chmod $mode $testroot/wt/alpha
1088 
1089 	(cd $testroot/wt && got commit -mm > $testroot/stdout)
1090 	ret=$?
1091 	if [ $ret -ne 0 ]; then
1092 		echo "got commit failed unexpectedly"
1093 		test_done "$testroot" "$ret"
1094 		return 1
1095 	fi
1096 
1097 	local commit_id=`git_show_head $testroot/repo`
1098 	echo 'M  alpha' > $testroot/stdout.expected
1099 	echo "Created commit $commit_id" >> $testroot/stdout.expected
1100 	cmp -s $testroot/stdout.expected $testroot/stdout
1101 	ret=$?
1102 	if [ $ret -ne 0 ]; then
1103 		diff -u $testroot/stdout.expected $testroot/stdout
1104 		test_done "$testroot" "$ret"
1105 		return 1
1106 	fi
1107 
1108 	local tree_id=$(got cat -r $testroot/repo $commit_id | \
1109 		grep ^tree | cut -d' ' -f2)
1110 	local alpha_id=$(got cat -r $testroot/repo $tree_id | \
1111 		grep 'alpha$' | cut -d' ' -f1)
1112 	echo "$alpha_id $expected_mode alpha" > $testroot/stdout.expected
1113 	got cat -r $testroot/repo $tree_id | grep 'alpha$' > $testroot/stdout
1114 	cmp -s $testroot/stdout.expected $testroot/stdout
1115 	ret=$?
1116 	if [ $ret -ne 0 ]; then
1117 		diff -u $testroot/stdout.expected $testroot/stdout
1118 	fi
1119 	return $ret
1120 }
1121 
1122 test_commit_normalizes_filemodes() {
1123 	local testroot=`test_init commit_normalizes_filemodes`
1124 
1125 	got checkout $testroot/repo $testroot/wt > /dev/null
1126 	ret=$?
1127 	if [ $ret -ne 0 ]; then
1128 		test_done "$testroot" "$ret"
1129 		return 1
1130 	fi
1131 
1132 	modes="600 400 460 640 440 660 444 666"
1133 	for m in $modes; do
1134 		commit_check_mode "$m" "0100644"
1135 		ret=$?
1136 		if [ $ret -ne 0 ]; then
1137 			break
1138 		fi
1139 	done
1140 	if [ $ret -ne 0 ]; then
1141 		test_done "$testroot" "$ret"
1142 		return 1
1143 	fi
1144 	modes="700 500 570 750 550 770 555 777"
1145 	for m in $modes; do
1146 		commit_check_mode "$m" "0100755"
1147 		ret=$?
1148 		if [ $ret -ne 0 ]; then
1149 			break
1150 		fi
1151 	done
1152 	if [ $ret -ne 0 ]; then
1153 		test_done "$testroot" "$ret"
1154 		return 1
1155 	fi
1156 	test_done "$testroot" "$ret"
1157 }
1158 
1159 test_commit_with_unrelated_submodule() {
1160 	local testroot=`test_init commit_with_unrelated_submodule`
1161 
1162 	make_single_file_repo $testroot/repo2 foo
1163 
1164 	(cd $testroot/repo && git -c protocol.file.allow=always \
1165 		submodule -q add ../repo2)
1166 	(cd $testroot/repo && git commit -q -m 'adding submodule')
1167 
1168 	got checkout $testroot/repo $testroot/wt > /dev/null
1169 	ret=$?
1170 	if [ $ret -ne 0 ]; then
1171 		echo "checkout failed unexpectedly" >&2
1172 		test_done "$testroot" "$ret"
1173 		return 1
1174 	fi
1175 
1176 	echo "modified alpha" > $testroot/wt/alpha
1177 
1178 	echo "" > $testroot/stdout.expected
1179 
1180 	(cd $testroot/wt && got commit -m 'modify alpha' > $testroot/stdout)
1181 	ret=$?
1182 	if [ $ret -ne 0 ]; then
1183 		echo "commit failed unexpectedly" >&2
1184 		test_done "$testroot" "$ret"
1185 		return 1
1186 	fi
1187 
1188 	local head_rev=`git_show_head $testroot/repo`
1189 	echo "M  alpha" > $testroot/stdout.expected
1190 	echo "Created commit $head_rev" >> $testroot/stdout.expected
1191 
1192 	cmp -s $testroot/stdout.expected $testroot/stdout
1193 	ret=$?
1194 	if [ $ret -ne 0 ]; then
1195 		diff -u $testroot/stdout.expected $testroot/stdout
1196 	fi
1197 	test_done "$testroot" "$ret"
1198 }
1199 
1200 check_symlinks() {
1201 	local wtpath="$1"
1202 	if ! [ -h $wtpath/alpha.link ]; then
1203 		echo "alpha.link is not a symlink"
1204 		return 1
1205 	fi
1206 
1207 	readlink $wtpath/alpha.link > $testroot/stdout
1208 	echo "alpha" > $testroot/stdout.expected
1209 	cmp -s $testroot/stdout.expected $testroot/stdout
1210 	ret=$?
1211 	if [ $ret -ne 0 ]; then
1212 		diff -u $testroot/stdout.expected $testroot/stdout
1213 		return 1
1214 	fi
1215 
1216 	if ! [ -h $wtpath/epsilon.link ]; then
1217 		echo "epsilon.link is not a symlink"
1218 		return 1
1219 	fi
1220 
1221 	readlink $wtpath/epsilon.link > $testroot/stdout
1222 	echo "epsilon" > $testroot/stdout.expected
1223 	cmp -s $testroot/stdout.expected $testroot/stdout
1224 	ret=$?
1225 	if [ $ret -ne 0 ]; then
1226 		diff -u $testroot/stdout.expected $testroot/stdout
1227 		return 1
1228 	fi
1229 
1230 	if [ -h $wtpath/passwd.link ]; then
1231 		echo -n "passwd.link is a symlink and points outside of work tree: " >&2
1232 		readlink $wtpath/passwd.link >&2
1233 		return 1
1234 	fi
1235 
1236 	echo -n "/etc/passwd" > $testroot/content.expected
1237 	cp $wtpath/passwd.link $testroot/content
1238 	ret=$?
1239 	if [ $ret -ne 0 ]; then
1240 		echo "cp command failed unexpectedly" >&2
1241 		return 1
1242 	fi
1243 
1244 	cmp -s $testroot/content.expected $testroot/content
1245 	ret=$?
1246 	if [ $ret -ne 0 ]; then
1247 		diff -u $testroot/content.expected $testroot/content
1248 		return 1
1249 	fi
1250 
1251 	readlink $wtpath/epsilon/beta.link > $testroot/stdout
1252 	echo "../beta" > $testroot/stdout.expected
1253 	cmp -s $testroot/stdout.expected $testroot/stdout
1254 	ret=$?
1255 	if [ $ret -ne 0 ]; then
1256 		diff -u $testroot/stdout.expected $testroot/stdout
1257 		return 1
1258 	fi
1259 
1260 	readlink $wtpath/nonexistent.link > $testroot/stdout
1261 	echo "nonexistent" > $testroot/stdout.expected
1262 	cmp -s $testroot/stdout.expected $testroot/stdout
1263 	ret=$?
1264 	if [ $ret -ne 0 ]; then
1265 		diff -u $testroot/stdout.expected $testroot/stdout
1266 		return 1
1267 	fi
1268 
1269 	return 0
1270 }
1271 
1272 test_commit_symlink() {
1273 	local testroot=`test_init commit_symlink`
1274 
1275 	got checkout $testroot/repo $testroot/wt > /dev/null
1276 	ret=$?
1277 	if [ $ret -ne 0 ]; then
1278 		test_done "$testroot" "$ret"
1279 		return 1
1280 	fi
1281 
1282 	(cd $testroot/wt && ln -s alpha alpha.link)
1283 	(cd $testroot/wt && ln -s epsilon epsilon.link)
1284 	(cd $testroot/wt && ln -s /etc/passwd passwd.link)
1285 	(cd $testroot/wt && ln -s ../beta epsilon/beta.link)
1286 	(cd $testroot/wt && ln -s nonexistent nonexistent.link)
1287 	(cd $testroot/wt && got add alpha.link epsilon.link passwd.link \
1288 		epsilon/beta.link nonexistent.link > /dev/null)
1289 
1290 	(cd $testroot/wt && got commit -m 'test commit_symlink' \
1291 		> $testroot/stdout 2> $testroot/stderr)
1292 	ret=$?
1293 	if [ $ret -eq 0 ]; then
1294 		echo "got commit succeeded unexpectedly" >&2
1295 		test_done "$testroot" "$ret"
1296 		return 1
1297 	fi
1298 	echo -n "got: $testroot/wt/passwd.link: " > $testroot/stderr.expected
1299 	echo "symbolic link points outside of paths under version control" \
1300 		>> $testroot/stderr.expected
1301 	cmp -s $testroot/stderr.expected $testroot/stderr
1302 	ret=$?
1303 	if [ $ret -ne 0 ]; then
1304 		diff -u $testroot/stderr.expected $testroot/stderr
1305 		test_done "$testroot" "$ret"
1306 		return 1
1307 	fi
1308 
1309 	(cd $testroot/wt && got commit -S -m 'test commit_symlink' \
1310 		> $testroot/stdout)
1311 
1312 	local head_rev=`git_show_head $testroot/repo`
1313 	echo "A  alpha.link" > $testroot/stdout.expected
1314 	echo "A  epsilon.link" >> $testroot/stdout.expected
1315 	echo "A  nonexistent.link" >> $testroot/stdout.expected
1316 	echo "A  passwd.link" >> $testroot/stdout.expected
1317 	echo "A  epsilon/beta.link" >> $testroot/stdout.expected
1318 	echo "Created commit $head_rev" >> $testroot/stdout.expected
1319 
1320 	cmp -s $testroot/stdout.expected $testroot/stdout
1321 	ret=$?
1322 	if [ $ret -ne 0 ]; then
1323 		diff -u $testroot/stdout.expected $testroot/stdout
1324 		test_done "$testroot" "$ret"
1325 		return 1
1326 	fi
1327 
1328 	# verify created in-repository tree
1329 	got checkout $testroot/repo $testroot/wt2 > /dev/null
1330 	ret=$?
1331 	if [ $ret -ne 0 ]; then
1332 		test_done "$testroot" "$ret"
1333 		return 1
1334 	fi
1335 	check_symlinks $testroot/wt2
1336 	ret=$?
1337 	if [ $ret -ne 0 ]; then
1338 		test_done "$testroot" "$ret"
1339 		return 1
1340 	fi
1341 
1342 	if ! [ -h $testroot/wt/passwd.link ]; then
1343 		echo 'passwd.link is not a symlink' >&2
1344 		test_done "$testroot" 1
1345 		return 1
1346 	fi
1347 
1348 	# 'got update' should reinstall passwd.link as a regular file
1349 	(cd $testroot/wt && got update > /dev/null)
1350 	check_symlinks $testroot/wt
1351 	ret=$?
1352 	if [ $ret -ne 0 ]; then
1353 		test_done "$testroot" "$ret"
1354 		return 1
1355 	fi
1356 
1357 	(cd $testroot/wt && ln -sf beta alpha.link)
1358 	(cd $testroot/wt && ln -sfh gamma epsilon.link)
1359 	rm $testroot/wt/epsilon/beta.link
1360 	echo "this is a regular file" > $testroot/wt/epsilon/beta.link
1361 	(cd $testroot/wt && ln -sf .got/bar dotgotbar.link)
1362 	(cd $testroot/wt && got add dotgotbar.link > /dev/null)
1363 	(cd $testroot/wt && got rm nonexistent.link > /dev/null)
1364 	(cd $testroot/wt && ln -sf gamma/delta zeta.link)
1365 	(cd $testroot/wt && ln -sf alpha new.link)
1366 	(cd $testroot/wt && got add new.link > /dev/null)
1367 
1368 	(cd $testroot/wt && got commit -m 'test commit_symlink' \
1369 		> $testroot/stdout 2> $testroot/stderr)
1370 	ret=$?
1371 	if [ $ret -eq 0 ]; then
1372 		echo "got commit succeeded unexpectedly" >&2
1373 		test_done "$testroot" "$ret"
1374 		return 1
1375 	fi
1376 	echo -n "got: $testroot/wt/dotgotbar.link: " > $testroot/stderr.expected
1377 	echo "symbolic link points outside of paths under version control" \
1378 		>> $testroot/stderr.expected
1379 	cmp -s $testroot/stderr.expected $testroot/stderr
1380 	ret=$?
1381 	if [ $ret -ne 0 ]; then
1382 		diff -u $testroot/stderr.expected $testroot/stderr
1383 		test_done "$testroot" "$ret"
1384 		return 1
1385 	fi
1386 
1387 	(cd $testroot/wt && got commit -S -m 'test commit_symlink' \
1388 		> $testroot/stdout)
1389 
1390 	local head_rev=`git_show_head $testroot/repo`
1391 	echo "A  dotgotbar.link" > $testroot/stdout.expected
1392 	echo "A  new.link" >> $testroot/stdout.expected
1393 	echo "M  alpha.link" >> $testroot/stdout.expected
1394 	echo "M  epsilon/beta.link" >> $testroot/stdout.expected
1395 	echo "M  epsilon.link" >> $testroot/stdout.expected
1396 	echo "D  nonexistent.link" >> $testroot/stdout.expected
1397 	echo "Created commit $head_rev" >> $testroot/stdout.expected
1398 
1399 	cmp -s $testroot/stdout.expected $testroot/stdout
1400 	ret=$?
1401 	if [ $ret -ne 0 ]; then
1402 		diff -u $testroot/stdout.expected $testroot/stdout
1403 		test_done "$testroot" "$ret"
1404 		return 1
1405 	fi
1406 
1407 	got tree -r $testroot/repo -c $head_rev -R > $testroot/stdout
1408 	cat > $testroot/stdout.expected <<EOF
1409 alpha
1410 alpha.link@ -> beta
1411 beta
1412 dotgotbar.link@ -> .got/bar
1413 epsilon/
1414 epsilon/beta.link
1415 epsilon/zeta
1416 epsilon.link@ -> gamma
1417 gamma/
1418 gamma/delta
1419 new.link@ -> alpha
1420 passwd.link@ -> /etc/passwd
1421 EOF
1422 	cmp -s $testroot/stdout.expected $testroot/stdout
1423 	ret=$?
1424 	if [ $ret -ne 0 ]; then
1425 		diff -u $testroot/stdout.expected $testroot/stdout
1426 	fi
1427 	test_done "$testroot" "$ret"
1428 }
1429 
1430 test_commit_fix_bad_symlink() {
1431 	local testroot=`test_init commit_fix_bad_symlink`
1432 
1433 	got checkout $testroot/repo $testroot/wt > /dev/null
1434 	ret=$?
1435 	if [ $ret -ne 0 ]; then
1436 		echo "got checkout failed unexpectedly" >&2
1437 		test_done "$testroot" "$ret"
1438 		return 1
1439 	fi
1440 
1441 	(cd $testroot/wt && ln -s /etc/passwd passwd.link)
1442 	(cd $testroot/wt && got add passwd.link > /dev/null)
1443 
1444 	(cd $testroot/wt && got commit -S -m 'commit bad symlink' \
1445 		> $testroot/stdout)
1446 
1447 	if ! [ -h $testroot/wt/passwd.link ]; then
1448 		echo 'passwd.link is not a symlink' >&2
1449 		test_done "$testroot" 1
1450 		return 1
1451 	fi
1452 	(cd $testroot/wt && got update >/dev/null)
1453 	if [ -h $testroot/wt/passwd.link ]; then
1454 		echo "passwd.link is a symlink but should be a regular file" >&2
1455 		test_done "$testroot" "1"
1456 		return 1
1457 	fi
1458 
1459 	# create another work tree which will contain the "bad" symlink
1460 	got checkout $testroot/repo $testroot/wt2 > /dev/null
1461 	ret=$?
1462 	if [ $ret -ne 0 ]; then
1463 		echo "got checkout failed unexpectedly" >&2
1464 		test_done "$testroot" "$ret"
1465 		return 1
1466 	fi
1467 
1468 	# change "bad" symlink back into a "good" symlink
1469 	(cd $testroot/wt && ln -sfh alpha passwd.link)
1470 
1471 	(cd $testroot/wt && got commit -m 'fix bad symlink' \
1472 		> $testroot/stdout)
1473 
1474 	local head_rev=`git_show_head $testroot/repo`
1475 	echo "M  passwd.link" > $testroot/stdout.expected
1476 	echo "Created commit $head_rev" >> $testroot/stdout.expected
1477 
1478 	cmp -s $testroot/stdout.expected $testroot/stdout
1479 	ret=$?
1480 	if [ $ret -ne 0 ]; then
1481 		diff -u $testroot/stdout.expected $testroot/stdout
1482 		test_done "$testroot" "$ret"
1483 		return 1
1484 	fi
1485 
1486 	if ! [ -h $testroot/wt/passwd.link ]; then
1487 		echo 'passwd.link is not a symlink' >&2
1488 		test_done "$testroot" 1
1489 		return 1
1490 	fi
1491 
1492 	readlink $testroot/wt/passwd.link > $testroot/stdout
1493 	echo "alpha" > $testroot/stdout.expected
1494 	cmp -s $testroot/stdout.expected $testroot/stdout
1495 	ret=$?
1496 	if [ $ret -ne 0 ]; then
1497 		diff -u $testroot/stdout.expected $testroot/stdout
1498 		return 1
1499 	fi
1500 
1501 	# Update the other work tree; the bad symlink should be fixed
1502 	(cd $testroot/wt2 && got update > /dev/null)
1503 	ret=$?
1504 	if [ $ret -ne 0 ]; then
1505 		echo "got checkout failed unexpectedly" >&2
1506 		test_done "$testroot" "$ret"
1507 		return 1
1508 	fi
1509 
1510 	if ! [ -h $testroot/wt2/passwd.link ]; then
1511 		echo 'passwd.link is not a symlink' >&2
1512 		test_done "$testroot" 1
1513 		return 1
1514 	fi
1515 
1516 	readlink $testroot/wt2/passwd.link > $testroot/stdout
1517 	echo "alpha" > $testroot/stdout.expected
1518 	cmp -s $testroot/stdout.expected $testroot/stdout
1519 	ret=$?
1520 	if [ $ret -ne 0 ]; then
1521 		diff -u $testroot/stdout.expected $testroot/stdout
1522 		return 1
1523 	fi
1524 
1525 	test_done "$testroot" "0"
1526 }
1527 
1528 test_commit_prepared_logmsg() {
1529 	local testroot=`test_init commit_prepared_logmsg`
1530 
1531 	got checkout $testroot/repo $testroot/wt > /dev/null
1532 	ret=$?
1533 	if [ $ret -ne 0 ]; then
1534 		test_done "$testroot" "$ret"
1535 		return 1
1536 	fi
1537 
1538 	echo "modified alpha" > $testroot/wt/alpha
1539 	(cd $testroot/wt && got rm beta >/dev/null)
1540 	echo "new file" > $testroot/wt/new
1541 	(cd $testroot/wt && got add new >/dev/null)
1542 
1543 	echo 'test commit_prepared_logmsg' > $testroot/logmsg
1544 
1545 	cat > $testroot/editor.sh <<EOF
1546 #!/bin/sh
1547 sed -i 's/foo/bar/' "\$1"
1548 EOF
1549 	chmod +x $testroot/editor.sh
1550 
1551 	(cd $testroot/wt && env VISUAL="$testroot/editor.sh" \
1552 		got commit -F "$testroot/logmsg" > $testroot/stdout)
1553 
1554 	local head_rev=`git_show_head $testroot/repo`
1555 	echo "A  new" > $testroot/stdout.expected
1556 	echo "M  alpha" >> $testroot/stdout.expected
1557 	echo "D  beta" >> $testroot/stdout.expected
1558 	echo "Created commit $head_rev" >> $testroot/stdout.expected
1559 
1560 	cmp -s $testroot/stdout.expected $testroot/stdout
1561 	ret=$?
1562 	if [ $ret -ne 0 ]; then
1563 		diff -u $testroot/stdout.expected $testroot/stdout
1564 		test_done "$testroot" "$ret"
1565 		return 1
1566 	fi
1567 
1568 	local author_time=`git_show_author_time $testroot/repo`
1569 	d=`date -u -r $author_time +"%a %b %e %X %Y UTC"`
1570 	echo "-----------------------------------------------" > $testroot/stdout.expected
1571 	echo "commit $head_rev (master)" >> $testroot/stdout.expected
1572 	echo "from: $GOT_AUTHOR" >> $testroot/stdout.expected
1573 	echo "date: $d" >> $testroot/stdout.expected
1574 	echo " " >> $testroot/stdout.expected
1575 	echo " test commit_prepared_logmsg" >> $testroot/stdout.expected
1576 	echo " " >> $testroot/stdout.expected
1577 
1578 	(cd $testroot/wt && got log -l 1 > $testroot/stdout)
1579 	cmp -s $testroot/stdout.expected $testroot/stdout
1580 	ret=$?
1581 	if [ $ret -ne 0 ]; then
1582 		diff -u $testroot/stdout.expected $testroot/stdout
1583 		test_done "$testroot" "$ret"
1584 		return 1
1585 	fi
1586 
1587 	echo "modified alpha again" > $testroot/wt/alpha
1588 
1589 	echo 'test commit_prepared_logmsg non-interactive' \
1590 		> $testroot/logmsg
1591 
1592 	(cd $testroot/wt && got commit -N -F "$testroot/logmsg" \
1593 		> $testroot/stdout)
1594 
1595 	local head_rev=`git_show_head $testroot/repo`
1596 	echo "M  alpha" > $testroot/stdout.expected
1597 	echo "Created commit $head_rev" >> $testroot/stdout.expected
1598 
1599 	cmp -s $testroot/stdout.expected $testroot/stdout
1600 	ret=$?
1601 	if [ $ret -ne 0 ]; then
1602 		diff -u $testroot/stdout.expected $testroot/stdout
1603 		test_done "$testroot" "$ret"
1604 		return 1
1605 	fi
1606 
1607 	local author_time=`git_show_author_time $testroot/repo`
1608 	d=`date -u -r $author_time +"%a %b %e %X %Y UTC"`
1609 	echo "-----------------------------------------------" \
1610 		> $testroot/stdout.expected
1611 	echo "commit $head_rev (master)" >> $testroot/stdout.expected
1612 	echo "from: $GOT_AUTHOR" >> $testroot/stdout.expected
1613 	echo "date: $d" >> $testroot/stdout.expected
1614 	echo " " >> $testroot/stdout.expected
1615 	echo " test commit_prepared_logmsg non-interactive" \
1616 		>> $testroot/stdout.expected
1617 	echo " " >> $testroot/stdout.expected
1618 
1619 	(cd $testroot/wt && got log -l 1 > $testroot/stdout)
1620 	cmp -s $testroot/stdout.expected $testroot/stdout
1621 	ret=$?
1622 	if [ $ret -ne 0 ]; then
1623 		diff -u $testroot/stdout.expected $testroot/stdout
1624 	fi
1625 	test_done "$testroot" "$ret"
1626 }
1627 
1628 test_commit_large_file() {
1629 	local testroot=`test_init commit_large_file`
1630 
1631 	got checkout $testroot/repo $testroot/wt > /dev/null
1632 	ret=$?
1633 	if [ $ret -ne 0 ]; then
1634 		test_done "$testroot" "$ret"
1635 		return 1
1636 	fi
1637 
1638 	dd status=none if=/dev/zero of=$testroot/wt/new bs=1M count=64
1639 	(cd $testroot/wt && got add new >/dev/null)
1640 
1641 	(cd $testroot/wt && got commit -m 'test commit_large_file' \
1642 		> $testroot/stdout)
1643 
1644 	local head_rev=`git_show_head $testroot/repo`
1645 	echo "A  new" > $testroot/stdout.expected
1646 	echo "Created commit $head_rev" >> $testroot/stdout.expected
1647 
1648 	cmp -s $testroot/stdout.expected $testroot/stdout
1649 	ret=$?
1650 	if [ $ret -ne 0 ]; then
1651 		diff -u $testroot/stdout.expected $testroot/stdout
1652 		test_done "$testroot" "$ret"
1653 		return 1
1654 	fi
1655 
1656 	new_id=`get_blob_id $testroot/repo "" new`
1657 	got cat -r $testroot/repo $new_id > $testroot/new
1658 	ret=$?
1659 	if [ $ret -ne 0 ]; then
1660 		echo "commit failed unexpectedly" >&2
1661 		test_done "$testroot" "1"
1662 		return 1
1663 	fi
1664 
1665 	cmp -s $testroot/new $testroot/wt/new
1666 	ret=$?
1667 	if [ $ret -ne 0 ]; then
1668 		diff -u $testroot/new $testroot/wt/new
1669 	fi
1670 	test_done "$testroot" "$ret"
1671 
1672 
1673 }
1674 
1675 test_commit_gitignore() {
1676 	local testroot=`test_init commit_gitignores`
1677 
1678 	got checkout $testroot/repo $testroot/wt > /dev/null
1679 	ret=$?
1680 	if [ $ret -ne 0 ]; then
1681 		test_done "$testroot" "$ret"
1682 		return 1
1683 	fi
1684 
1685 	mkdir -p $testroot/wt/tree1/foo
1686 	mkdir -p $testroot/wt/tree2/foo
1687 	echo "tree1/**" > $testroot/wt/.gitignore
1688 	echo "tree2/**" >> $testroot/wt/.gitignore
1689 	echo -n > $testroot/wt/tree1/bar
1690 	echo -n > $testroot/wt/tree1/foo/baz
1691 	echo -n > $testroot/wt/tree2/bar
1692 	echo -n > $testroot/wt/tree2/foo/baz
1693 	echo -n > $testroot/wt/epsilon/zeta1
1694 	echo -n > $testroot/wt/epsilon/zeta2
1695 
1696 	(cd $testroot/wt && got add -I -R tree1 > /dev/null)
1697 	(cd $testroot/wt && got add -I tree2/foo/baz > /dev/null)
1698 	(cd $testroot/wt && got commit -m "gitignore add" > /dev/null)
1699 	(cd $testroot/wt && got log -P -l 1 | egrep '^ .' > $testroot/stdout)
1700 
1701 	echo ' gitignore add' > $testroot/stdout.expected
1702 	echo ' A  tree1/bar' >> $testroot/stdout.expected
1703 	echo ' A  tree1/foo/baz' >> $testroot/stdout.expected
1704 	echo ' A  tree2/foo/baz' >> $testroot/stdout.expected
1705 
1706 	cmp -s $testroot/stdout.expected $testroot/stdout
1707 	ret=$?
1708 	if [ $ret -ne 0 ]; then
1709 		diff -u $testroot/stdout.expected $testroot/stdout
1710 		test_done "$testroot" "$ret"
1711 		return 1
1712 	fi
1713 
1714 	echo touch > $testroot/wt/tree1/bar
1715 	echo touch > $testroot/wt/tree1/foo/baz
1716 	echo touch > $testroot/wt/epsilon/zeta1
1717 
1718 	(cd $testroot/wt && got commit -m "gitignore change" > /dev/null)
1719 	(cd $testroot/wt && got log -P -l 1 | egrep '^ .' > $testroot/stdout)
1720 
1721 	echo ' gitignore change' > $testroot/stdout.expected
1722 	echo ' M  tree1/bar' >> $testroot/stdout.expected
1723 	echo ' M  tree1/foo/baz' >> $testroot/stdout.expected
1724 
1725 	cmp -s $testroot/stdout.expected $testroot/stdout
1726 	ret=$?
1727 	if [ $ret -ne 0 ]; then
1728 		diff -u $testroot/stdout.expected $testroot/stdout
1729 		test_done "$testroot" "$ret"
1730 		return 1
1731 	fi
1732 
1733 	test_done "$testroot" "$ret"
1734 }
1735 
1736 test_commit_bad_author() {
1737 	local testroot=`test_init commit_bad_author`
1738 
1739 	got checkout $testroot/repo $testroot/wt > /dev/null
1740 	ret=$?
1741 	if [ $ret -ne 0 ]; then
1742 		test_done "$testroot" $ret
1743 		return 1
1744 	fi
1745 
1746 	echo "modified alpha" > $testroot/wt/alpha
1747 
1748 	(cd $testroot/wt && got commit \
1749 		-A "${GIT_AUTHOR_NAME}<${GIT_AUTHOR_EMAIL}>" -m 'edit alpha') \
1750 		> /dev/null 2> $testroot/stderr
1751 	ret=$?
1752 	if [ $ret -eq 0 ]; then
1753 		test_done "$testroot" 1
1754 		return 1
1755 	fi
1756 
1757 	echo -n "got: ${GIT_AUTHOR_NAME}<${GIT_AUTHOR_EMAIL}>: " \
1758 	     > $testroot/stderr.expected
1759 	echo -n 'space between author name and email required: ' \
1760 	     >> $testroot/stderr.expected
1761 	echo 'commit author formatting would make Git unhappy' \
1762 		>> $testroot/stderr.expected
1763 	cmp -s $testroot/stderr.expected $testroot/stderr
1764 	ret=$?
1765 	if [ $ret -ne 0 ]; then
1766 		diff -u $testroot/stderr.expected $testroot/stderr
1767 		test_done "$testroot" $ret
1768 		return 1
1769 	fi
1770 
1771 	test_done "$testroot" 0
1772 }
1773 
1774 test_commit_logmsg_ref() {
1775 	local testroot=`test_init commit_logmsg_ref`
1776 
1777 	got checkout $testroot/repo $testroot/wt > /dev/null
1778 	ret=$?
1779 	if [ $ret -ne 0 ]; then
1780 		test_done "$testroot" "$ret"
1781 		return 1
1782 	fi
1783 
1784 	(cd $testroot/repo && git checkout -q -b newbranch)
1785 
1786 	local bo_logmsg_prefix="log message of backed-out commit"
1787 	local cy_logmsg_prefix="log message of cherrypicked commit"
1788 	local branch_rev_logmsg="changes on newbranch to cherrypick"
1789 	local branch_rev2_logmsg="modified zeta on newbranch to cherrypick"
1790 
1791 	echo "modified delta on branch" > $testroot/repo/gamma/delta
1792 	echo "modified alpha on branch" > $testroot/repo/alpha
1793 	(cd $testroot/repo && git rm -q beta)
1794 	echo "new file on branch" > $testroot/repo/epsilon/new
1795 	(cd $testroot/repo && git add epsilon/new)
1796 
1797 	git_commit $testroot/repo -m "$branch_rev_logmsg"
1798 	local branch_rev=`git_show_head $testroot/repo`
1799 
1800 	echo "modified zeta on branch" > $testroot/repo/epsilon/zeta
1801 
1802 	git_commit $testroot/repo -m "$branch_rev2_logmsg"
1803 	local branch_rev2=`git_show_head $testroot/repo`
1804 
1805 	(cd $testroot/wt && got cherrypick $branch_rev > /dev/null)
1806 	(cd $testroot/wt && got cherrypick $branch_rev2 > /dev/null)
1807 
1808 	cat > $testroot/editor.sh <<EOF
1809 #!/bin/sh
1810 sed -i 's/# l/l/' "\$1"
1811 EOF
1812 	chmod +x $testroot/editor.sh
1813 
1814 	(cd $testroot/wt && env VISUAL="$testroot/editor.sh" \
1815 	    got commit > /dev/null)
1816 	ret=$?
1817 	if [ $ret -ne 0 ]; then
1818 		echo "'got commit' failed unexpectedly" >&2
1819 		test_done "$testroot" "1"
1820 		return 1
1821 	fi
1822 
1823 	# check that multiple cherrypicked log messages populate the editor
1824 	local first=`printf '%s\n%s' $branch_rev $branch_rev2 | sort | head -1`
1825 	local second=`printf '%s\n%s' $branch_rev $branch_rev2 | sort | tail -1`
1826 
1827 	if [ $branch_rev == $first ]; then
1828 		local first_msg=$branch_rev_logmsg
1829 		local second_msg=$branch_rev2_logmsg
1830 	else
1831 		local first_msg=$branch_rev2_logmsg
1832 		local second_msg=$branch_rev_logmsg
1833 	fi
1834 
1835 	echo " $cy_logmsg_prefix $first:" > $testroot/stdout.expected
1836 	echo " $first_msg" >> $testroot/stdout.expected
1837 	echo " " >> $testroot/stdout.expected
1838 	echo " $cy_logmsg_prefix $second:" >> $testroot/stdout.expected
1839 	echo " $second_msg" >> $testroot/stdout.expected
1840 	echo " " >> $testroot/stdout.expected
1841 
1842 	(cd $testroot/wt && got log -l2 | \
1843 	    grep -A2 'log message' | sed '/^--/d' > $testroot/stdout)
1844 
1845 	cmp -s $testroot/stdout.expected $testroot/stdout
1846 	ret=$?
1847 	if [ $ret -ne 0 ]; then
1848 		diff -u $testroot/stdout.expected $testroot/stdout
1849 		test_done "$testroot" "$ret"
1850 		return 1
1851 	fi
1852 
1853 	# check that only the relevant log message populates the editor
1854 	# when the changes from one of two backout commits are reverted
1855 	got checkout $testroot/repo $testroot/wt2 > /dev/null
1856 	ret=$?
1857 	if [ $ret -ne 0 ]; then
1858 		test_done "$testroot" "$ret"
1859 		return 1
1860 	fi
1861 
1862 	(cd $testroot/wt2 && got backout $branch_rev > /dev/null)
1863 	(cd $testroot/wt2 && got backout $branch_rev2 > /dev/null)
1864 	(cd $testroot/wt2 && got revert epsilon/zeta > /dev/null)
1865 
1866 	(cd $testroot/wt2 && env VISUAL="$testroot/editor.sh" \
1867 	    got commit > /dev/null)
1868 	ret=$?
1869 	if [ $ret -ne 0 ]; then
1870 		echo "'got commit' failed unexpectedly" >&2
1871 		test_done "$testroot" "1"
1872 		return 1
1873 	fi
1874 
1875 	echo " $bo_logmsg_prefix $branch_rev:" > $testroot/stdout.expected
1876 	echo " $branch_rev_logmsg" >> $testroot/stdout.expected
1877 	echo " " >> $testroot/stdout.expected
1878 
1879 	(cd $testroot/wt2 && got log -l1 | \
1880 	    grep -A2 'log message' > $testroot/stdout)
1881 
1882 	cmp -s $testroot/stdout.expected $testroot/stdout
1883 	ret=$?
1884 	if [ $ret -ne 0 ]; then
1885 		diff -u $testroot/stdout.expected $testroot/stdout
1886 		test_done "$testroot" "$ret"
1887 		return 1
1888 	fi
1889 
1890 	# check that a cherrypicked log message is still
1891 	# used when its changes are only partially reverted
1892 	branch_rev_logmsg="changes to cherrypick and partially revert"
1893 
1894 	echo "newline in alpha" >> $testroot/repo/alpha
1895 	echo "modified epsilon/zeta on branch" > $testroot/repo/epsilon/zeta
1896 
1897 	git_commit $testroot/repo -m "$branch_rev_logmsg"
1898 	branch_rev=`git_show_head $testroot/repo`
1899 
1900 	(cd $testroot/wt && got cherrypick $branch_rev > /dev/null)
1901 	(cd $testroot/wt && got revert alpha > /dev/null)
1902 
1903 	(cd $testroot/wt && env VISUAL="$testroot/editor.sh" \
1904 	    got commit > /dev/null)
1905 	ret=$?
1906 	if [ $ret -ne 0 ]; then
1907 		echo "'got commit' failed unexpectedly" >&2
1908 		test_done "$testroot" "1"
1909 		return 1
1910 	fi
1911 
1912 	echo " $cy_logmsg_prefix $branch_rev:" > $testroot/stdout.expected
1913 	echo " $branch_rev_logmsg" >> $testroot/stdout.expected
1914 	echo " " >> $testroot/stdout.expected
1915 
1916 	(cd $testroot/wt && got log -l1 | \
1917 	    grep -A2 'log message' > $testroot/stdout)
1918 
1919 	cmp -s $testroot/stdout.expected $testroot/stdout
1920 	ret=$?
1921 	if [ $ret -ne 0 ]; then
1922 		diff -u $testroot/stdout.expected $testroot/stdout
1923 		test_done "$testroot" "$ret"
1924 		return 1
1925 	fi
1926 
1927 	# check we don't use and consequently delete the logmsg ref of a
1928 	# cherrypicked commit when omitting its changed path from the commit
1929 	branch_rev_logmsg="changes to cherrypick but omit from the commit"
1930 
1931 	echo "changed delta" >> $testroot/repo/gamma/delta
1932 
1933 	git_commit $testroot/repo -m "$branch_rev_logmsg"
1934 	local author_time=`git_show_author_time $testroot/repo`
1935 	local d=`date -u -r $author_time +"%a %b %e %X %Y UTC"`
1936 	branch_rev=`git_show_head $testroot/repo`
1937 
1938 	(cd $testroot/wt && got update > /dev/null)
1939 	ret=$?
1940 	if [ $ret -ne 0 ]; then
1941 		echo "got update failed unexpectedly" >&2
1942 		test_done "$testroot" "$ret"
1943 		return 1
1944 	fi
1945 
1946 	(cd $testroot/wt && got cherrypick $branch_rev > /dev/null)
1947 
1948 	echo "changed alpha" >> $testroot/wt/alpha
1949 
1950 	(cd $testroot/wt && got commit -m \
1951 	    "don't commit cy change to gamma/delta" alpha > /dev/null)
1952 	ret=$?
1953 	if [ $ret -ne 0 ]; then
1954 		echo "'got commit' failed unexpectedly" >&2
1955 		test_done "$testroot" "1"
1956 		return 1
1957 	fi
1958 
1959 	# confirm logmsg ref was not deleted with got cherrypick -l
1960 	echo "-----------------------------------------------" \
1961 	    > $testroot/stdout.expected
1962 	echo "cherrypick $branch_rev (newbranch)" >> $testroot/stdout.expected
1963 	echo "from: $GOT_AUTHOR" >> $testroot/stdout.expected
1964 	echo "date: $d" >> $testroot/stdout.expected
1965 	echo " " >> $testroot/stdout.expected
1966 	echo " $branch_rev_logmsg" >> $testroot/stdout.expected
1967 	echo " " >> $testroot/stdout.expected
1968 	echo " M  gamma/delta" >> $testroot/stdout.expected
1969 	echo >> $testroot/stdout.expected
1970 
1971 	(cd $testroot/wt && got cherrypick -l > $testroot/stdout)
1972 
1973 	cmp -s $testroot/stdout.expected $testroot/stdout
1974 	ret=$?
1975 	if [ $ret -ne 0 ]; then
1976 		diff -u $testroot/stdout.expected $testroot/stdout
1977 		test_done "$testroot" "$ret"
1978 		return 1
1979 	fi
1980 
1981 	# confirm a previously unused logmsg ref is picked up
1982 	# when an affected path is actually committed
1983 	(cd $testroot/wt && env VISUAL="$testroot/editor.sh" \
1984 	    got commit > /dev/null)
1985 	ret=$?
1986 	if [ $ret -ne 0 ]; then
1987 		echo "'got commit' failed unexpectedly" >&2
1988 		test_done "$testroot" "1"
1989 		return 1
1990 	fi
1991 
1992 	echo " $cy_logmsg_prefix $branch_rev:" > $testroot/stdout.expected
1993 	echo " $branch_rev_logmsg" >> $testroot/stdout.expected
1994 	echo " " >> $testroot/stdout.expected
1995 
1996 	(cd $testroot/wt && got log -l1 | \
1997 	    grep -A2 'log message' > $testroot/stdout)
1998 
1999 	cmp -s $testroot/stdout.expected $testroot/stdout
2000 	ret=$?
2001 	if [ $ret -ne 0 ]; then
2002 		diff -u $testroot/stdout.expected $testroot/stdout
2003 		test_done "$testroot" "$ret"
2004 		return 1
2005 	fi
2006 
2007 	# make sure we are not littering work trees
2008 	# by leaving temp got-logmsg-* files behind
2009 	echo -n > $testroot/stdout.expected
2010 	(cd $testroot/wt && got status > $testroot/stdout)
2011 
2012 	cmp -s $testroot/stdout.expected $testroot/stdout
2013 	ret=$?
2014 	if [ $ret -ne 0 ]; then
2015 		echo "$testroot/wt is not clean"
2016 		diff -u $testroot/stdout.expected $testroot/stdout
2017 		test_done "$testroot" "$ret"
2018 		return 1
2019 	fi
2020 
2021 	(cd $testroot/wt2 && got status > $testroot/stdout)
2022 
2023 	cmp -s $testroot/stdout.expected $testroot/stdout
2024 	ret=$?
2025 	if [ $ret -ne 0 ]; then
2026 		echo "$testroot/repo is not clean"
2027 		diff -u $testroot/stdout.expected $testroot/stdout
2028 	fi
2029 	test_done "$testroot" "$ret"
2030 }
2031 
2032 test_parseargs "$@"
2033 run_test test_commit_basic
2034 run_test test_commit_new_subdir
2035 run_test test_commit_subdir
2036 run_test test_commit_single_file
2037 run_test test_commit_out_of_date
2038 run_test test_commit_added_subdirs
2039 run_test test_commit_deleted_subdirs
2040 run_test test_commit_rejects_conflicted_file
2041 run_test test_commit_single_file_multiple
2042 run_test test_commit_added_and_modified_in_same_dir
2043 run_test test_commit_path_prefix
2044 run_test test_commit_dir_path
2045 run_test test_commit_selected_paths
2046 run_test test_commit_outside_refs_heads
2047 run_test test_commit_no_email
2048 run_test test_commit_tree_entry_sorting
2049 run_test test_commit_cmdline_author
2050 run_test test_commit_gotconfig_author
2051 run_test test_commit_gotconfig_worktree_author
2052 run_test test_commit_gitconfig_author
2053 run_test test_commit_xbit_change
2054 run_test test_commit_normalizes_filemodes
2055 run_test test_commit_with_unrelated_submodule
2056 run_test test_commit_symlink
2057 run_test test_commit_fix_bad_symlink
2058 run_test test_commit_prepared_logmsg
2059 run_test test_commit_large_file
2060 run_test test_commit_gitignore
2061 run_test test_commit_bad_author
2062 run_test test_commit_logmsg_ref