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_cherrypick_basic() {
20 	local testroot=`test_init cherrypick_basic`
21 
22 	got checkout $testroot/repo $testroot/wt > /dev/null
23 	ret="$?"
24 	if [ "$ret" != "0" ]; then
25 		test_done "$testroot" "$ret"
26 		return 1
27 	fi
28 
29 	(cd $testroot/repo && git checkout -q -b newbranch)
30 	echo "modified delta on branch" > $testroot/repo/gamma/delta
31 	git_commit $testroot/repo -m "committing to delta on newbranch"
32 
33 	echo "modified alpha on branch" > $testroot/repo/alpha
34 	(cd $testroot/repo && git rm -q beta)
35 	echo "new file on branch" > $testroot/repo/epsilon/new
36 	(cd $testroot/repo && git add epsilon/new)
37 	git_commit $testroot/repo -m "committing more changes on newbranch"
38 
39 	local branch_rev=`git_show_head $testroot/repo`
40 
41 	echo "modified new file on branch" > $testroot/repo/epsilon/new
42 	git_commit $testroot/repo -m "committing more changes on newbranch"
43 	local branch_rev2=`git_show_head $testroot/repo`
44 
45 	(cd $testroot/wt && got cherrypick $branch_rev > $testroot/stdout)
46 
47 	echo "G  alpha" > $testroot/stdout.expected
48 	echo "D  beta" >> $testroot/stdout.expected
49 	echo "A  epsilon/new" >> $testroot/stdout.expected
50 	echo "Merged commit $branch_rev" >> $testroot/stdout.expected
51 
52 	cmp -s $testroot/stdout.expected $testroot/stdout
53 	ret="$?"
54 	if [ "$ret" != "0" ]; then
55 		diff -u $testroot/stdout.expected $testroot/stdout
56 		test_done "$testroot" "$ret"
57 		return 1
58 	fi
59 
60 	echo "modified alpha on branch" > $testroot/content.expected
61 	cat $testroot/wt/alpha > $testroot/content
62 	cmp -s $testroot/content.expected $testroot/content
63 	ret="$?"
64 	if [ "$ret" != "0" ]; then
65 		diff -u $testroot/content.expected $testroot/content
66 		test_done "$testroot" "$ret"
67 		return 1
68 	fi
69 
70 	if [ -e $testroot/wt/beta ]; then
71 		echo "removed file beta still exists on disk" >&2
72 		test_done "$testroot" "1"
73 		return 1
74 	fi
75 
76 	echo "new file on branch" > $testroot/content.expected
77 	cat $testroot/wt/epsilon/new > $testroot/content
78 	cmp -s $testroot/content.expected $testroot/content
79 	ret="$?"
80 	if [ "$ret" != "0" ]; then
81 		diff -u $testroot/content.expected $testroot/content
82 		test_done "$testroot" "$ret"
83 		return 1
84 	fi
85 
86 	echo 'M  alpha' > $testroot/stdout.expected
87 	echo 'D  beta' >> $testroot/stdout.expected
88 	echo 'A  epsilon/new' >> $testroot/stdout.expected
89 
90 	(cd $testroot/wt && got status > $testroot/stdout)
91 
92 	cmp -s $testroot/stdout.expected $testroot/stdout
93 	ret="$?"
94 	if [ "$ret" != "0" ]; then
95 		diff -u $testroot/stdout.expected $testroot/stdout
96 		test_done "$testroot" "$ret"
97 		return 1
98 	fi
99 
100 	(cd $testroot/wt && got cherrypick $branch_rev2 > $testroot/stdout)
101 
102 	echo "G  epsilon/new" > $testroot/stdout.expected
103 	echo "Merged commit $branch_rev2" >> $testroot/stdout.expected
104 
105 	cmp -s $testroot/stdout.expected $testroot/stdout
106 	ret="$?"
107 	if [ "$ret" != "0" ]; then
108 		diff -u $testroot/stdout.expected $testroot/stdout
109 		test_done "$testroot" "$ret"
110 		return 1
111 	fi
112 
113 	echo 'M  alpha' > $testroot/stdout.expected
114 	echo 'D  beta' >> $testroot/stdout.expected
115 	echo 'A  epsilon/new' >> $testroot/stdout.expected
116 
117 	(cd $testroot/wt && got status > $testroot/stdout)
118 
119 	cmp -s $testroot/stdout.expected $testroot/stdout
120 	ret="$?"
121 	if [ "$ret" != "0" ]; then
122 		diff -u $testroot/stdout.expected $testroot/stdout
123 	fi
124 	test_done "$testroot" "$ret"
125 }
126 
127 test_cherrypick_root_commit() {
128 	local testroot=`test_init cherrypick_root_commit`
129 
130 	got checkout $testroot/repo $testroot/wt > /dev/null
131 	ret="$?"
132 	if [ "$ret" != "0" ]; then
133 		test_done "$testroot" "$ret"
134 		return 1
135 	fi
136 
137 	(cd $testroot/repo && git checkout -q -b newbranch)
138 	(cd $testroot/repo && git rm -q alpha)
139 	(cd $testroot/repo && git rm -q beta)
140 	(cd $testroot/repo && git rm -q epsilon/zeta)
141 	(cd $testroot/repo && git rm -q gamma/delta)
142 	mkdir -p $testroot/repo/epsilon
143 	echo "new file on branch" > $testroot/repo/epsilon/new
144 	(cd $testroot/repo && git add epsilon/new)
145 	git_commit $testroot/repo -m "committing on newbranch"
146 
147 	echo "modified new file on branch" >> $testroot/repo/epsilon/new
148 	git_commit $testroot/repo -m "committing on newbranch again"
149 
150 	tree=`git_show_tree $testroot/repo`
151 	root_commit=`git_commit_tree $testroot/repo "new root commit" $tree`
152 
153 	(cd $testroot/wt && got cherrypick $root_commit > $testroot/stdout)
154 
155 	echo "A  epsilon/new" > $testroot/stdout.expected
156 	echo "Merged commit $root_commit" >> $testroot/stdout.expected
157 
158 	cmp -s $testroot/stdout.expected $testroot/stdout
159 	ret="$?"
160 	if [ "$ret" != "0" ]; then
161 		diff -u $testroot/stdout.expected $testroot/stdout
162 		test_done "$testroot" "$ret"
163 		return 1
164 	fi
165 
166 	echo "new file on branch" > $testroot/content.expected
167 	echo "modified new file on branch" >> $testroot/content.expected
168 	cat $testroot/wt/epsilon/new > $testroot/content
169 	cmp -s $testroot/content.expected $testroot/content
170 	ret="$?"
171 	if [ "$ret" != "0" ]; then
172 		diff -u $testroot/content.expected $testroot/content
173 		test_done "$testroot" "$ret"
174 		return 1
175 	fi
176 
177 	echo 'A  epsilon/new' > $testroot/stdout.expected
178 
179 	(cd $testroot/wt && got status > $testroot/stdout)
180 
181 	cmp -s $testroot/stdout.expected $testroot/stdout
182 	ret="$?"
183 	if [ "$ret" != "0" ]; then
184 		diff -u $testroot/stdout.expected $testroot/stdout
185 	fi
186 	test_done "$testroot" "$ret"
187 }
188 
189 test_cherrypick_into_work_tree_with_conflicts() {
190 	local testroot=`test_init cherrypick_into_work_tree_with_conflicts`
191 
192 	got checkout $testroot/repo $testroot/wt > /dev/null
193 	ret="$?"
194 	if [ "$ret" != "0" ]; then
195 		test_done "$testroot" "$ret"
196 		return 1
197 	fi
198 
199 	(cd $testroot/repo && git checkout -q -b newbranch)
200 	echo "modified delta on branch" > $testroot/repo/gamma/delta
201 	git_commit $testroot/repo -m "committing to delta on newbranch"
202 
203 	echo "modified alpha on branch" > $testroot/repo/alpha
204 	(cd $testroot/repo && git rm -q beta)
205 	echo "new file on branch" > $testroot/repo/epsilon/new
206 	(cd $testroot/repo && git add epsilon/new)
207 	git_commit $testroot/repo -m "committing more changes on newbranch"
208 
209 	local branch_rev=`git_show_head $testroot/repo`
210 
211 	# fake a merge conflict
212 	echo '<<<<<<<' > $testroot/wt/alpha
213 	echo 'alpha' >> $testroot/wt/alpha
214 	echo '=======' >> $testroot/wt/alpha
215 	echo 'alpha, too' >> $testroot/wt/alpha
216 	echo '>>>>>>>' >> $testroot/wt/alpha
217 	cp $testroot/wt/alpha $testroot/content.expected
218 
219 	echo "C  alpha" > $testroot/stdout.expected
220 	(cd $testroot/wt && got status  > $testroot/stdout)
221 	cmp -s $testroot/stdout.expected $testroot/stdout
222 	ret="$?"
223 	if [ "$ret" != "0" ]; then
224 		diff -u $testroot/stdout.expected $testroot/stdout
225 		test_done "$testroot" "$ret"
226 		return 1
227 	fi
228 
229 	(cd $testroot/wt && got cherrypick $branch_rev \
230 		> $testroot/stdout 2> $testroot/stderr)
231 	ret="$?"
232 	if [ "$ret" = "0" ]; then
233 		echo "cherrypick succeeded unexpectedly" >&2
234 		test_done "$testroot" "1"
235 		return 1
236 	fi
237 
238 	echo -n > $testroot/stdout.expected
239 	echo -n "got: work tree contains conflicted files; " \
240 		> $testroot/stderr.expected
241 	echo "these conflicts must be resolved first" \
242 		>> $testroot/stderr.expected
243 
244 	cmp -s $testroot/stdout.expected $testroot/stdout
245 	ret="$?"
246 	if [ "$ret" != "0" ]; then
247 		diff -u $testroot/stdout.expected $testroot/stdout
248 		test_done "$testroot" "$ret"
249 		return 1
250 	fi
251 
252 	cmp -s $testroot/stderr.expected $testroot/stderr
253 	ret="$?"
254 	if [ "$ret" != "0" ]; then
255 		diff -u $testroot/stderr.expected $testroot/stderr
256 		test_done "$testroot" "$ret"
257 		return 1
258 	fi
259 
260 	cmp -s $testroot/content.expected $testroot/wt/alpha
261 	ret="$?"
262 	if [ "$ret" != "0" ]; then
263 		diff -u $testroot/content.expected $testroot/wt/alpha
264 	fi
265 	test_done "$testroot" "$ret"
266 }
267 
268 test_cherrypick_into_work_tree_with_mixed_commits() {
269 	local testroot=`test_init cherrypick_into_work_tree_with_mixed_commits`
270 	local first_rev=`git_show_head $testroot/repo`
271 
272 	echo "modified alpha" > $testroot/repo/alpha
273 	git_commit $testroot/repo -m "committing to alpha" 
274 	local second_rev=`git_show_head $testroot/repo`
275 
276 	got checkout $testroot/repo $testroot/wt > /dev/null
277 	ret="$?"
278 	if [ "$ret" != "0" ]; then
279 		test_done "$testroot" "$ret"
280 		return 1
281 	fi
282 
283 	(cd $testroot/repo && git checkout -q -b newbranch)
284 	echo "modified delta on branch" > $testroot/repo/gamma/delta
285 	git_commit $testroot/repo -m "committing to delta on newbranch"
286 
287 	(cd $testroot/repo && git rm -q beta)
288 	echo "new file on branch" > $testroot/repo/epsilon/new
289 	(cd $testroot/repo && git add epsilon/new)
290 	git_commit $testroot/repo -m "committing more changes on newbranch"
291 
292 	local branch_rev=`git_show_head $testroot/repo`
293 
294 	(cd $testroot/wt && got update -c $first_rev alpha >/dev/null)
295 
296 	(cd $testroot/wt && got cherrypick $branch_rev \
297 		> $testroot/stdout 2> $testroot/stderr)
298 	ret="$?"
299 	if [ "$ret" = "0" ]; then
300 		echo "cherrypick succeeded unexpectedly" >&2
301 		test_done "$testroot" "1"
302 		return 1
303 	fi
304 
305 	echo -n > $testroot/stdout.expected
306 	echo -n "got: work tree contains files from multiple base commits; " \
307 		> $testroot/stderr.expected
308 	echo "the entire work tree must be updated first" \
309 		>> $testroot/stderr.expected
310 
311 	cmp -s $testroot/stdout.expected $testroot/stdout
312 	ret="$?"
313 	if [ "$ret" != "0" ]; then
314 		diff -u $testroot/stdout.expected $testroot/stdout
315 		test_done "$testroot" "$ret"
316 		return 1
317 	fi
318 
319 	cmp -s $testroot/stderr.expected $testroot/stderr
320 	ret="$?"
321 	if [ "$ret" != "0" ]; then
322 		diff -u $testroot/stderr.expected $testroot/stderr
323 	fi
324 	test_done "$testroot" "$ret"
325 
326 }
327 
328 test_cherrypick_modified_submodule() {
329 	local testroot=`test_init cherrypick_modified_submodules`
330 
331 	make_single_file_repo $testroot/repo2 foo
332 
333 	(cd $testroot/repo && git submodule -q add ../repo2)
334 	(cd $testroot/repo && git commit -q -m 'adding submodule')
335 
336 	got checkout $testroot/repo $testroot/wt > /dev/null
337 
338 	echo "modified foo" > $testroot/repo2/foo
339 	(cd $testroot/repo2 && git commit -q -a -m 'modified a submodule')
340 
341 	(cd $testroot/repo && git checkout -q -b newbranch)
342 	# Update the repo/repo2 submodule link on newbranch
343 	(cd $testroot/repo && git -C repo2 pull -q)
344 	(cd $testroot/repo && git add repo2)
345 	git_commit $testroot/repo -m "modified submodule link"
346 	local commit_id=`git_show_head $testroot/repo`
347 
348 	# This cherrypick is a no-op because Got's file index
349 	# does not track submodules.
350 	(cd $testroot/wt && got cherrypick $commit_id > $testroot/stdout)
351 
352 	echo -n > $testroot/stdout.expected
353 	cmp -s $testroot/stdout.expected $testroot/stdout
354 	ret="$?"
355 	if [ "$ret" != "0" ]; then
356 		diff -u $testroot/stdout.expected $testroot/stdout
357 	fi
358 	test_done "$testroot" "$ret"
359 }
360 
361 test_cherrypick_added_submodule() {
362 	local testroot=`test_init cherrypick_added_submodules`
363 
364 	got checkout $testroot/repo $testroot/wt > /dev/null
365 
366 	make_single_file_repo $testroot/repo2 foo
367 
368 	# Add the repo/repo2 submodule on newbranch
369 	(cd $testroot/repo && git checkout -q -b newbranch)
370 	(cd $testroot/repo && git submodule -q add ../repo2)
371 	(cd $testroot/repo && git commit -q -m 'adding submodule')
372 	local commit_id=`git_show_head $testroot/repo`
373 
374 	(cd $testroot/wt && got cherrypick $commit_id > $testroot/stdout)
375 
376 	echo "A  .gitmodules" > $testroot/stdout.expected
377 	echo "Merged commit $commit_id" >> $testroot/stdout.expected
378 	cmp -s $testroot/stdout.expected $testroot/stdout
379 	ret="$?"
380 	if [ "$ret" != "0" ]; then
381 		diff -u $testroot/stdout.expected $testroot/stdout
382 	fi
383 	test_done "$testroot" "$ret"
384 }
385 
386 test_cherrypick_conflict_wt_file_vs_repo_submodule() {
387 	local testroot=`test_init cherrypick_conflict_wt_file_vs_repo_submodule`
388 
389 	got checkout $testroot/repo $testroot/wt > /dev/null
390 
391 	# Add a file which will clash with the submodule
392 	echo "This is a file called repo2" > $testroot/wt/repo2
393 	(cd $testroot/wt && got add repo2 > /dev/null)
394 	(cd $testroot/wt && got commit -m 'add file repo2' > /dev/null)
395 	ret="$?"
396 	if [ "$ret" != "0" ]; then
397 		echo "commit failed unexpectedly" >&2
398 		test_done "$testroot" "1"
399 		return 1
400 	fi
401 
402 	make_single_file_repo $testroot/repo2 foo
403 
404 	# Add the repo/repo2 submodule on newbranch
405 	(cd $testroot/repo && git checkout -q -b newbranch)
406 	(cd $testroot/repo && git submodule -q add ../repo2)
407 	(cd $testroot/repo && git commit -q -m 'adding submodule')
408 	local commit_id=`git_show_head $testroot/repo`
409 
410 	# Modify the clashing file such that any modifications brought
411 	# in by 'got cherrypick' would require a merge.
412 	echo "This file was changed" > $testroot/wt/repo2
413 
414 	(cd $testroot/wt && got update >/dev/null)
415 	(cd $testroot/wt && got cherrypick $commit_id > $testroot/stdout)
416 
417 	echo "A  .gitmodules" > $testroot/stdout.expected
418 	echo "Merged commit $commit_id" >> $testroot/stdout.expected
419 	cmp -s $testroot/stdout.expected $testroot/stdout
420 	ret="$?"
421 	if [ "$ret" != "0" ]; then
422 		diff -u $testroot/stdout.expected $testroot/stdout
423 		test_done "$testroot" "$ret"
424 		return 1
425 	fi
426 
427 	(cd $testroot/wt && got status > $testroot/stdout)
428 
429 	echo "A  .gitmodules" > $testroot/stdout.expected
430 	echo "M  repo2" >> $testroot/stdout.expected
431 	cmp -s $testroot/stdout.expected $testroot/stdout
432 	ret="$?"
433 	if [ "$ret" != "0" ]; then
434 		diff -u $testroot/stdout.expected $testroot/stdout
435 	fi
436 	test_done "$testroot" "$ret"
437 }
438 
439 test_cherrypick_modified_symlinks() {
440 	local testroot=`test_init cherrypick_modified_symlinks`
441 
442 	(cd $testroot/repo && ln -s alpha alpha.link)
443 	(cd $testroot/repo && ln -s epsilon epsilon.link)
444 	(cd $testroot/repo && ln -s /etc/passwd passwd.link)
445 	(cd $testroot/repo && ln -s ../beta epsilon/beta.link)
446 	(cd $testroot/repo && ln -s nonexistent nonexistent.link)
447 	(cd $testroot/repo && git add .)
448 	git_commit $testroot/repo -m "add symlinks"
449 	local commit_id1=`git_show_head $testroot/repo`
450 
451 	got tree -r $testroot/repo -R -c $commit_id1 \
452 		> $testroot/stdout
453 	cat > $testroot/stdout.expected <<EOF
454 alpha
455 alpha.link@ -> alpha
456 beta
457 epsilon/
458 epsilon/beta.link@ -> ../beta
459 epsilon/zeta
460 epsilon.link@ -> epsilon
461 gamma/
462 gamma/delta
463 nonexistent.link@ -> nonexistent
464 passwd.link@ -> /etc/passwd
465 EOF
466 	cmp -s $testroot/stdout.expected $testroot/stdout
467 	ret="$?"
468 	if [ "$ret" != "0" ]; then
469 		diff -u $testroot/stdout.expected $testroot/stdout
470 		test_done "$testroot" "$ret"
471 		return 1
472 	fi
473 
474 	got branch -r $testroot/repo foo
475 
476 	got checkout -b foo $testroot/repo $testroot/wt > /dev/null
477 
478 	(cd $testroot/repo && ln -sf beta alpha.link)
479 	(cd $testroot/repo && ln -sfT gamma epsilon.link)
480 	(cd $testroot/repo && ln -sf ../gamma/delta epsilon/beta.link)
481 	(cd $testroot/repo && ln -sf .got/foo $testroot/repo/dotgotfoo.link)
482 	(cd $testroot/repo && git rm -q nonexistent.link)
483 	(cd $testroot/repo && ln -sf epsilon/zeta zeta.link)
484 	(cd $testroot/repo && git add .)
485 	git_commit $testroot/repo -m "change symlinks"
486 	local commit_id2=`git_show_head $testroot/repo`
487 
488 	(cd $testroot/wt && got cherrypick $commit_id2 > $testroot/stdout)
489 
490 	echo "G  alpha.link" > $testroot/stdout.expected
491 	echo "G  epsilon/beta.link" >> $testroot/stdout.expected
492 	echo "A  dotgotfoo.link" >> $testroot/stdout.expected
493 	echo "G  epsilon.link" >> $testroot/stdout.expected
494 	echo "D  nonexistent.link" >> $testroot/stdout.expected
495 	echo "A  zeta.link" >> $testroot/stdout.expected
496 	echo "Merged commit $commit_id2" >> $testroot/stdout.expected
497 	cmp -s $testroot/stdout.expected $testroot/stdout
498 	ret="$?"
499 	if [ "$ret" != "0" ]; then
500 		diff -u $testroot/stdout.expected $testroot/stdout
501 		test_done "$testroot" "$ret"
502 		return 1
503 	fi
504 
505 	if ! [ -h $testroot/wt/alpha.link ]; then
506 		echo "alpha.link is not a symlink"
507 		test_done "$testroot" "1"
508 		return 1
509 	fi
510 
511 	readlink $testroot/wt/alpha.link > $testroot/stdout
512 	echo "beta" > $testroot/stdout.expected
513 	cmp -s $testroot/stdout.expected $testroot/stdout
514 	ret="$?"
515 	if [ "$ret" != "0" ]; then
516 		diff -u $testroot/stdout.expected $testroot/stdout
517 		test_done "$testroot" "$ret"
518 		return 1
519 	fi
520 
521 	if ! [ -h $testroot/wt/dotgotfoo.link ]; then
522 		echo "dotgotfoo.link is not a symlink"
523 		test_done "$testroot" "1"
524 		return 1
525 	fi
526 
527 	readlink $testroot/wt/dotgotfoo.link > $testroot/stdout
528 	echo ".got/foo" > $testroot/stdout.expected
529 	cmp -s $testroot/stdout.expected $testroot/stdout
530 	ret="$?"
531 	if [ "$ret" != "0" ]; then
532 		diff -u $testroot/stdout.expected $testroot/stdout
533 		test_done "$testroot" "$ret"
534 		return 1
535 	fi
536 
537 	if ! [ -h $testroot/wt/epsilon.link ]; then
538 		echo "epsilon.link is not a symlink"
539 		test_done "$testroot" "1"
540 		return 1
541 	fi
542 
543 	readlink $testroot/wt/epsilon.link > $testroot/stdout
544 	echo "gamma" > $testroot/stdout.expected
545 	cmp -s $testroot/stdout.expected $testroot/stdout
546 	ret="$?"
547 	if [ "$ret" != "0" ]; then
548 		diff -u $testroot/stdout.expected $testroot/stdout
549 		test_done "$testroot" "$ret"
550 		return 1
551 	fi
552 
553 	if [ -h $testroot/wt/passwd.link ]; then
554 		echo -n "passwd.link symlink points outside of work tree: " >&2
555 		readlink $testroot/wt/passwd.link >&2
556 		test_done "$testroot" "1"
557 		return 1
558 	fi
559 
560 	echo -n "/etc/passwd" > $testroot/content.expected
561 	cp $testroot/wt/passwd.link $testroot/content
562 
563 	cmp -s $testroot/content.expected $testroot/content
564 	ret="$?"
565 	if [ "$ret" != "0" ]; then
566 		diff -u $testroot/content.expected $testroot/content
567 		test_done "$testroot" "$ret"
568 		return 1
569 	fi
570 
571 	readlink $testroot/wt/epsilon/beta.link > $testroot/stdout
572 	echo "../gamma/delta" > $testroot/stdout.expected
573 	cmp -s $testroot/stdout.expected $testroot/stdout
574 	ret="$?"
575 	if [ "$ret" != "0" ]; then
576 		diff -u $testroot/stdout.expected $testroot/stdout
577 		test_done "$testroot" "$ret"
578 		return 1
579 	fi
580 
581 	if [ -h $testroot/wt/nonexistent.link ]; then
582 		echo -n "nonexistent.link still exists on disk: " >&2
583 		readlink $testroot/wt/nonexistent.link >&2
584 		test_done "$testroot" "1"
585 		return 1
586 	fi
587 
588 	(cd $testroot/wt && got commit -m 'commit cherrypick result' \
589 		> /dev/null 2>$testroot/stderr)
590 	ret="$?"
591 	if [ "$ret" == "0" ]; then
592 		echo "got commit succeeded unexpectedly" >&2
593 		test_done "$testroot" "$ret"
594 		return 1
595 	fi
596 	echo -n "got: $testroot/wt/dotgotfoo.link: symbolic link points " \
597 		> $testroot/stderr.expected
598 	echo "outside of paths under version control" \
599 		>> $testroot/stderr.expected
600 	cmp -s $testroot/stderr.expected $testroot/stderr
601 	ret="$?"
602 	if [ "$ret" != "0" ]; then
603 		diff -u $testroot/stderr.expected $testroot/stderr
604 		test_done "$testroot" "$ret"
605 		return 1
606 	fi
607 
608 	(cd $testroot/wt && got commit -S -m 'commit cherrypick result' \
609 		> /dev/null)
610 	ret="$?"
611 	if [ "$ret" != "0" ]; then
612 		echo "got commit failed unexpectedly" >&2
613 		test_done "$testroot" "$ret"
614 		return 1
615 	fi
616 	local commit_id2=`git_show_head $testroot/repo`
617 
618 	got tree -r $testroot/repo -R -c $commit_id2 \
619 		> $testroot/stdout
620 	cat > $testroot/stdout.expected <<EOF
621 alpha
622 alpha.link@ -> beta
623 beta
624 dotgotfoo.link@ -> .got/foo
625 epsilon/
626 epsilon/beta.link@ -> ../gamma/delta
627 epsilon/zeta
628 epsilon.link@ -> gamma
629 gamma/
630 gamma/delta
631 passwd.link@ -> /etc/passwd
632 zeta.link@ -> epsilon/zeta
633 EOF
634 	cmp -s $testroot/stdout.expected $testroot/stdout
635 	ret="$?"
636 	if [ "$ret" != "0" ]; then
637 		diff -u $testroot/stdout.expected $testroot/stdout
638 	fi
639 	test_done "$testroot" "$ret"
640 }
641 
642 test_cherrypick_symlink_conflicts() {
643 	local testroot=`test_init cherrypick_symlink_conflicts`
644 
645 	(cd $testroot/repo && ln -s alpha alpha.link)
646 	(cd $testroot/repo && ln -s epsilon epsilon.link)
647 	(cd $testroot/repo && ln -s /etc/passwd passwd.link)
648 	(cd $testroot/repo && ln -s ../beta epsilon/beta.link)
649 	(cd $testroot/repo && ln -s nonexistent nonexistent.link)
650 	(cd $testroot/repo && ln -sf epsilon/zeta zeta.link)
651 	(cd $testroot/repo && git add .)
652 	git_commit $testroot/repo -m "add symlinks"
653 	local commit_id1=`git_show_head $testroot/repo`
654 
655 	(cd $testroot/repo && ln -sf beta alpha.link)
656 	(cd $testroot/repo && ln -sf beta boo.link)
657 	(cd $testroot/repo && ln -sfT gamma epsilon.link)
658 	(cd $testroot/repo && ln -sf ../gamma/delta epsilon/beta.link)
659 	echo 'this is regular file foo' > $testroot/repo/dotgotfoo.link
660 	(cd $testroot/repo && ln -sf .got/bar dotgotbar.link)
661 	(cd $testroot/repo && git rm -q nonexistent.link)
662 	(cd $testroot/repo && ln -sf gamma/delta zeta.link)
663 	(cd $testroot/repo && ln -sf alpha new.link)
664 	(cd $testroot/repo && git add .)
665 	git_commit $testroot/repo -m "change symlinks"
666 	local commit_id2=`git_show_head $testroot/repo`
667 
668 	got branch -r $testroot/repo -c $commit_id1 foo
669 	got checkout -b foo $testroot/repo $testroot/wt > /dev/null
670 
671 	# modified symlink to file A vs modified symlink to file B
672 	(cd $testroot/wt && ln -sf gamma/delta alpha.link)
673 	# modified symlink to dir A vs modified symlink to file B
674 	(cd $testroot/wt && ln -sfT beta epsilon.link)
675 	# modeified symlink to file A vs modified symlink to dir B
676 	(cd $testroot/wt && ln -sfT ../gamma epsilon/beta.link)
677 	# added regular file A vs added bad symlink to file A
678 	(cd $testroot/wt && ln -sf .got/foo dotgotfoo.link)
679 	(cd $testroot/wt && got add dotgotfoo.link > /dev/null)
680 	# added bad symlink to file A vs added regular file A
681 	echo 'this is regular file bar' > $testroot/wt/dotgotbar.link
682 	(cd $testroot/wt && got add dotgotbar.link > /dev/null)
683 	# added symlink to file A vs unversioned file A
684 	echo 'this is unversioned file boo' > $testroot/wt/boo.link
685 	# removed symlink to non-existent file A vs modified symlink
686 	# to nonexistent file B
687 	(cd $testroot/wt && ln -sf nonexistent2 nonexistent.link)
688 	# modified symlink to file A vs removed symlink to file A
689 	(cd $testroot/wt && got rm zeta.link > /dev/null)
690 	# added symlink to file A vs added symlink to file B
691 	(cd $testroot/wt && ln -sf beta new.link)
692 	(cd $testroot/wt && got add new.link > /dev/null)
693 	(cd $testroot/wt && got commit -S -m  "change symlinks on foo" \
694 		> /dev/null)
695 
696 	(cd $testroot/wt && got update >/dev/null)
697 	(cd $testroot/wt && got cherrypick $commit_id2 > $testroot/stdout)
698 
699 	echo -n > $testroot/stdout.expected
700 	echo "C  alpha.link" >> $testroot/stdout.expected
701 	echo "C  epsilon/beta.link" >> $testroot/stdout.expected
702 	echo "?  boo.link" >> $testroot/stdout.expected
703 	echo "C  epsilon.link" >> $testroot/stdout.expected
704 	echo "C  dotgotbar.link" >> $testroot/stdout.expected
705 	echo "C  dotgotfoo.link" >> $testroot/stdout.expected
706 	echo "D  nonexistent.link" >> $testroot/stdout.expected
707 	echo "!  zeta.link" >> $testroot/stdout.expected
708 	echo "C  new.link" >> $testroot/stdout.expected
709 	echo "Merged commit $commit_id2" >> $testroot/stdout.expected
710 	echo "Files with new merge conflicts: 6" >> $testroot/stdout.expected
711 	echo -n "Files which had incoming changes but could not be found " \
712 		>> $testroot/stdout.expected
713 	echo "in the work tree: 1" >> $testroot/stdout.expected
714 	echo -n "Files not merged because an unversioned file was found in " \
715 		>> $testroot/stdout.expected
716 	echo "the work tree: 1" >> $testroot/stdout.expected
717 	cmp -s $testroot/stdout.expected $testroot/stdout
718 	ret="$?"
719 	if [ "$ret" != "0" ]; then
720 		diff -u $testroot/stdout.expected $testroot/stdout
721 		test_done "$testroot" "$ret"
722 		return 1
723 	fi
724 
725 	if [ -h $testroot/wt/alpha.link ]; then
726 		echo "alpha.link is a symlink"
727 		test_done "$testroot" "1"
728 		return 1
729 	fi
730 
731 	echo "<<<<<<< merged change: commit $commit_id2" \
732 		> $testroot/content.expected
733 	echo "beta" >> $testroot/content.expected
734 	echo "3-way merge base: commit $commit_id1" \
735 		>> $testroot/content.expected
736 	echo "alpha" >> $testroot/content.expected
737 	echo "=======" >> $testroot/content.expected
738 	echo "gamma/delta" >> $testroot/content.expected
739 	echo '>>>>>>>' >> $testroot/content.expected
740 	echo -n "" >> $testroot/content.expected
741 
742 	cp $testroot/wt/alpha.link $testroot/content
743 	cmp -s $testroot/content.expected $testroot/content
744 	ret="$?"
745 	if [ "$ret" != "0" ]; then
746 		diff -u $testroot/content.expected $testroot/content
747 		test_done "$testroot" "$ret"
748 		return 1
749 	fi
750 
751 	if [ -h $testroot/wt/boo.link ]; then
752 		echo "boo.link is a symlink"
753 		test_done "$testroot" "1"
754 		return 1
755 	fi
756 
757 	echo "this is unversioned file boo" > $testroot/content.expected
758 	cp $testroot/wt/boo.link $testroot/content
759 	cmp -s $testroot/content.expected $testroot/content
760 	ret="$?"
761 	if [ "$ret" != "0" ]; then
762 		diff -u $testroot/content.expected $testroot/content
763 		test_done "$testroot" "$ret"
764 		return 1
765 	fi
766 
767 	if [ -h $testroot/wt/epsilon.link ]; then
768 		echo "epsilon.link is a symlink"
769 		test_done "$testroot" "1"
770 		return 1
771 	fi
772 
773 	echo "<<<<<<< merged change: commit $commit_id2" \
774 		> $testroot/content.expected
775 	echo "gamma" >> $testroot/content.expected
776 	echo "3-way merge base: commit $commit_id1" \
777 		>> $testroot/content.expected
778 	echo "epsilon" >> $testroot/content.expected
779 	echo "=======" >> $testroot/content.expected
780 	echo "beta" >> $testroot/content.expected
781 	echo '>>>>>>>' >> $testroot/content.expected
782 	echo -n "" >> $testroot/content.expected
783 
784 	cp $testroot/wt/epsilon.link $testroot/content
785 	cmp -s $testroot/content.expected $testroot/content
786 	ret="$?"
787 	if [ "$ret" != "0" ]; then
788 		diff -u $testroot/content.expected $testroot/content
789 		test_done "$testroot" "$ret"
790 		return 1
791 	fi
792 
793 	if [ -h $testroot/wt/passwd.link ]; then
794 		echo -n "passwd.link symlink points outside of work tree: " >&2
795 		readlink $testroot/wt/passwd.link >&2
796 		test_done "$testroot" "1"
797 		return 1
798 	fi
799 
800 	echo -n "/etc/passwd" > $testroot/content.expected
801 	cp $testroot/wt/passwd.link $testroot/content
802 
803 	cmp -s $testroot/content.expected $testroot/content
804 	ret="$?"
805 	if [ "$ret" != "0" ]; then
806 		diff -u $testroot/content.expected $testroot/content
807 		test_done "$testroot" "$ret"
808 		return 1
809 	fi
810 
811 	if [ -h $testroot/wt/epsilon/beta.link ]; then
812 		echo "epsilon/beta.link is a symlink"
813 		test_done "$testroot" "1"
814 		return 1
815 	fi
816 
817 	echo "<<<<<<< merged change: commit $commit_id2" \
818 		> $testroot/content.expected
819 	echo "../gamma/delta" >> $testroot/content.expected
820 	echo "3-way merge base: commit $commit_id1" \
821 		>> $testroot/content.expected
822 	echo "../beta" >> $testroot/content.expected
823 	echo "=======" >> $testroot/content.expected
824 	echo "../gamma" >> $testroot/content.expected
825 	echo '>>>>>>>' >> $testroot/content.expected
826 	echo -n "" >> $testroot/content.expected
827 
828 	cp $testroot/wt/epsilon/beta.link $testroot/content
829 	cmp -s $testroot/content.expected $testroot/content
830 	ret="$?"
831 	if [ "$ret" != "0" ]; then
832 		diff -u $testroot/content.expected $testroot/content
833 		test_done "$testroot" "$ret"
834 		return 1
835 	fi
836 
837 	if [ -h $testroot/wt/nonexistent.link ]; then
838 		echo -n "nonexistent.link still exists on disk: " >&2
839 		readlink $testroot/wt/nonexistent.link >&2
840 		test_done "$testroot" "1"
841 		return 1
842 	fi
843 
844 	if [ -h $testroot/wt/dotgotfoo.link ]; then
845 		echo "dotgotfoo.link is a symlink"
846 		test_done "$testroot" "1"
847 		return 1
848 	fi
849 
850 	echo "<<<<<<< merged change: commit $commit_id2" \
851 		> $testroot/content.expected
852 	echo "this is regular file foo" >> $testroot/content.expected
853 	echo "=======" >> $testroot/content.expected
854 	echo -n ".got/foo" >> $testroot/content.expected
855 	echo '>>>>>>>' >> $testroot/content.expected
856 	cp $testroot/wt/dotgotfoo.link $testroot/content
857 	cmp -s $testroot/content.expected $testroot/content
858 	ret="$?"
859 	if [ "$ret" != "0" ]; then
860 		diff -u $testroot/content.expected $testroot/content
861 		test_done "$testroot" "$ret"
862 		return 1
863 	fi
864 
865 	if [ -h $testroot/wt/dotgotbar.link ]; then
866 		echo "dotgotbar.link is a symlink"
867 		test_done "$testroot" "1"
868 		return 1
869 	fi
870 	echo "<<<<<<< merged change: commit $commit_id2" \
871 		> $testroot/content.expected
872 	echo -n ".got/bar" >> $testroot/content.expected
873 	echo "=======" >> $testroot/content.expected
874 	echo "this is regular file bar" >> $testroot/content.expected
875 	echo '>>>>>>>' >> $testroot/content.expected
876 	echo -n "" >> $testroot/content.expected
877 	cp $testroot/wt/dotgotbar.link $testroot/content
878 	cmp -s $testroot/content.expected $testroot/content
879 	ret="$?"
880 	if [ "$ret" != "0" ]; then
881 		diff -u $testroot/content.expected $testroot/content
882 		test_done "$testroot" "$ret"
883 		return 1
884 	fi
885 
886 	if [ -h $testroot/wt/new.link ]; then
887 		echo "new.link is a symlink"
888 		test_done "$testroot" "1"
889 		return 1
890 	fi
891 
892 	echo "<<<<<<< merged change: commit $commit_id2" \
893 		> $testroot/content.expected
894 	echo "alpha" >> $testroot/content.expected
895 	echo "=======" >> $testroot/content.expected
896 	echo "beta" >> $testroot/content.expected
897 	echo '>>>>>>>' >> $testroot/content.expected
898 	echo -n "" >> $testroot/content.expected
899 
900 	cp $testroot/wt/new.link $testroot/content
901 	cmp -s $testroot/content.expected $testroot/content
902 	ret="$?"
903 	if [ "$ret" != "0" ]; then
904 		diff -u $testroot/content.expected $testroot/content
905 		test_done "$testroot" "$ret"
906 		return 1
907 	fi
908 
909 	echo "A  dotgotfoo.link" > $testroot/stdout.expected
910 	echo "M  new.link" >> $testroot/stdout.expected
911 	echo "D  nonexistent.link" >> $testroot/stdout.expected
912 	(cd $testroot/wt && got status > $testroot/stdout)
913 	if [ "$ret" != "0" ]; then
914 		diff -u $testroot/stdout.expected $testroot/stdout
915 		test_done "$testroot" "$ret"
916 		return 1
917 	fi
918 
919 	test_done "$testroot" "0"
920 }
921 
922 test_cherrypick_with_path_prefix_and_empty_tree() {
923 	local testroot=`test_init cherrypick_with_path_prefix_and_empty_tree 1`
924 
925 	(cd $testroot/repo && git commit --allow-empty \
926 		-m "initial empty commit" >/dev/null)
927 
928 	(cd $testroot/repo && got br bar >/dev/null)
929 
930 	mkdir -p $testroot/repo/epsilon
931 	echo "file foo" > $testroot/repo/epsilon/foo
932 	(cd $testroot/repo && git add .)
933 	git_commit $testroot/repo -m "add file foo"
934 	local commit_id=`git_show_head $testroot/repo`
935 
936 	got checkout -b bar $testroot/repo $testroot/wt > /dev/null
937 	ret="$?"
938 	if [ "$ret" != "0" ]; then
939 		echo "got checkout failed unexpectedly" >&2
940 		test_done "$testroot" "$ret"
941 		return 1
942 	fi
943 
944 	mkdir -p $testroot/wt/epsilon
945 	echo "new file" > $testroot/wt/epsilon/new
946 	(cd $testroot/wt && got add epsilon/new >/dev/null)
947 	(cd $testroot/wt && got commit -m "add file on branch bar" > /dev/null)
948 
949 	got checkout -b bar -p epsilon $testroot/repo $testroot/wt2 > /dev/null
950 	ret="$?"
951 	if [ "$ret" != "0" ]; then
952 		echo "got checkout failed unexpectedly" >&2
953 		test_done "$testroot" "$ret"
954 		return 1
955 	fi
956 	(cd $testroot/wt2 && got cherrypick $commit_id > $testroot/stdout)
957 
958 	echo "A  foo" > $testroot/stdout.expected
959 	echo "Merged commit $commit_id" >> $testroot/stdout.expected
960 
961 	cmp -s $testroot/stdout.expected $testroot/stdout
962 	ret="$?"
963 	if [ "$ret" != "0" ]; then
964 		diff -u $testroot/stdout.expected $testroot/stdout
965 	fi
966 	test_done "$testroot" "$ret"
967 }
968 
969 test_cherrypick_conflict_no_eol() {
970 	local testroot=`test_init cherrypick_conflict_no_eol 1`
971 	local content_a="aaa\naaa\naaa\naaa\naaa\naaa\n"
972 	local content_b="aaa\naaa\nbbb\naaa\naaa\naaa\naaa"
973 	local content_c="aaa\naaa\nccc\naaa\naaa\naaa\naaa"
974 
975 	printf "$content_a" > $testroot/repo/a
976 	(cd $testroot/repo && git add a)
977 	git_commit $testroot/repo -m "initial commit"
978 
979 	(cd $testroot/repo && got branch newbranch)
980 
981 	printf "$content_b" > $testroot/repo/a
982 	git_commit $testroot/repo -m "change bbb"
983 
984 	printf "$content_c" > $testroot/repo/a
985 	git_commit $testroot/repo -m "change ccc"
986 	local ccc_commit=`git_show_head $testroot/repo`
987 
988 	got checkout -b newbranch $testroot/repo $testroot/wt > /dev/null
989 	ret="$?"
990 	if [ "$ret" != "0" ]; then
991 		test_done "$testroot" "$ret"
992 		return 1
993 	fi
994 
995 	(cd $testroot/wt && got cherrypick $ccc_commit > $testroot/stdout)
996 
997 	echo "C  a" > $testroot/stdout.expected
998 	echo "Merged commit $ccc_commit" >> $testroot/stdout.expected
999 	echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
1000 
1001 	cmp -s $testroot/stdout.expected $testroot/stdout
1002 	ret="$?"
1003 	if [ "$ret" != "0" ]; then
1004 		diff -u $testroot/stdout.expected $testroot/stdout
1005 	fi
1006 	test_done "$testroot" "$ret"
1007 }
1008 
1009 test_cherrypick_conflict_no_eol2() {
1010 	local testroot=`test_init cherrypick_conflict_no_eol2 1`
1011 	local content_a="aaa\naaa\naaa\naaa\naaa\naaa"
1012 	local content_b="aaa\naaa\nbbb\naaa\naaa\naaa"
1013 	local content_c="aaa\naaa\nbbb\naaa\naaa\naaa\n"
1014 
1015 	printf "$content_a" > $testroot/repo/a
1016 	(cd $testroot/repo && git add a)
1017 	git_commit $testroot/repo -m "initial commit"
1018 
1019 	(cd $testroot/repo && got branch newbranch)
1020 
1021 	printf "$content_b" > $testroot/repo/a
1022 	git_commit $testroot/repo -m "change bbb"
1023 
1024 	printf "$content_c" > $testroot/repo/a
1025 	git_commit $testroot/repo -m "change ccc"
1026 	local ccc_commit=`git_show_head $testroot/repo`
1027 
1028 	got checkout -b newbranch $testroot/repo $testroot/wt > /dev/null
1029 	ret="$?"
1030 	if [ "$ret" != "0" ]; then
1031 		test_done "$testroot" "$ret"
1032 		return 1
1033 	fi
1034 
1035 	(cd $testroot/wt && got cherrypick $ccc_commit \
1036 		> $testroot/stdout 2> $testroot/stderr)
1037 
1038 	echo "C  a" > $testroot/stdout.expected
1039 	echo "Merged commit $ccc_commit" >> $testroot/stdout.expected
1040 	echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
1041 
1042 	cmp -s $testroot/stdout.expected $testroot/stdout
1043 	ret="$?"
1044 	if [ "$ret" != "0" ]; then
1045 		diff -u $testroot/stdout.expected $testroot/stdout
1046 	fi
1047 	test_done "$testroot" "$ret"
1048 }
1049 
1050 test_cherrypick_unrelated_changes() {
1051 	local testroot=`test_init cherrypick_unrelated_changes`
1052 
1053 	# Sorry about the large HERE document but I have not found
1054 	# a smaller reproduction recipe yet...
1055 	cat > $testroot/repo/reference.c <<EOF
1056 const struct got_error *
1057 got_ref_alloc(struct got_reference **ref, const char *name,
1058     struct got_object_id *id)
1059 {
1060         if (!is_valid_ref_name(name))
1061                 return got_error_path(name, GOT_ERR_BAD_REF_NAME);
1062 
1063         return alloc_ref(ref, name, id, 0);
1064 }
1065 
1066 static const struct got_error *
1067 parse_packed_ref_line(struct got_reference **ref, const char *abs_refname,
1068     const char *line)
1069 {
1070         struct got_object_id id;
1071         const char *name;
1072 
1073         *ref = NULL;
1074 
1075         if (line[0] == '#' || line[0] == '^')
1076                 return NULL;
1077 
1078         if (!got_parse_sha1_digest(id.sha1, line))
1079                 return got_error(GOT_ERR_BAD_REF_DATA);
1080 
1081         if (abs_refname) {
1082                 if (strcmp(line + SHA1_DIGEST_STRING_LENGTH, abs_refname) != 0)
1083                         return NULL;
1084                 name = abs_refname;
1085         } else
1086                 name = line + SHA1_DIGEST_STRING_LENGTH;
1087 
1088         return alloc_ref(ref, name, &id, GOT_REF_IS_PACKED);
1089 }
1090 
1091 static const struct got_error *
1092 open_packed_ref(struct got_reference **ref, FILE *f, const char **subdirs,
1093     int nsubdirs, const char *refname)
1094 {
1095         const struct got_error *err = NULL;
1096         char *abs_refname;
1097         char *line = NULL;
1098         size_t linesize = 0;
1099         ssize_t linelen;
1100         int i, ref_is_absolute = (strncmp(refname, "refs/", 5) == 0);
1101 
1102         *ref = NULL;
1103 
1104         if (ref_is_absolute)
1105                 abs_refname = (char *)refname;
1106         do {
1107                 linelen = getline(&line, &linesize, f);
1108                 if (linelen == -1) {
1109                         if (feof(f))
1110                                 break;
1111                         err = got_ferror(f, GOT_ERR_BAD_REF_DATA);
1112                         break;
1113                 }
1114                 if (linelen > 0 && line[linelen - 1] == '\n')
1115                         line[linelen - 1] = '\0';
1116                 for (i = 0; i < nsubdirs; i++) {
1117                         if (!ref_is_absolute &&
1118                             asprintf(&abs_refname, "refs/%s/%s", subdirs[i],
1119                             refname) == -1)
1120                                 return got_error_from_errno("asprintf");
1121                         err = parse_packed_ref_line(ref, abs_refname, line);
1122                         if (!ref_is_absolute)
1123                                 free(abs_refname);
1124                         if (err || *ref != NULL)
1125                                 break;
1126                 }
1127                 if (err)
1128                         break;
1129         } while (*ref == NULL);
1130         free(line);
1131 
1132         return err;
1133 }
1134 
1135 static const struct got_error *
1136 open_ref(struct got_reference **ref, const char *path_refs, const char *subdir,
1137     const char *name, int lock)
1138 {
1139         const struct got_error *err = NULL;
1140         char *path = NULL;
1141         char *absname = NULL;
1142         int ref_is_absolute = (strncmp(name, "refs/", 5) == 0);
1143         int ref_is_well_known = (subdir[0] == '\0' && is_well_known_ref(name));
1144 
1145         *ref = NULL;
1146 
1147         if (ref_is_absolute || ref_is_well_known) {
1148                 if (asprintf(&path, "%s/%s", path_refs, name) == -1)
1149                         return got_error_from_errno("asprintf");
1150                 absname = (char *)name;
1151         } else {
1152                 if (asprintf(&path, "%s/%s%s%s", path_refs, subdir,
1153                     subdir[0] ? "/" : "", name) == -1)
1154                         return got_error_from_errno("asprintf");
1155 
1156                 if (asprintf(&absname, "refs/%s%s%s",
1157                     subdir, subdir[0] ? "/" : "", name) == -1) {
1158                         err = got_error_from_errno("asprintf");
1159                         goto done;
1160                 }
1161         }
1162 
1163         err = parse_ref_file(ref, name, absname, path, lock);
1164 done:
1165         if (!ref_is_absolute && !ref_is_well_known)
1166                 free(absname);
1167         free(path);
1168         return err;
1169 }
1170 
1171 const struct got_error *
1172 got_ref_open(struct got_reference **ref, struct got_repository *repo,
1173    const char *refname, int lock)
1174 {
1175         const struct got_error *err = NULL;
1176         char *path_refs = NULL;
1177         const char *subdirs[] = {
1178             GOT_REF_HEADS, GOT_REF_TAGS, GOT_REF_REMOTES
1179         };
1180         size_t i;
1181         int well_known = is_well_known_ref(refname);
1182         struct got_lockfile *lf = NULL;
1183 
1184         *ref = NULL;
1185 
1186         path_refs = get_refs_dir_path(repo, refname);
1187         if (path_refs == NULL) {
1188                 err = got_error_from_errno2("get_refs_dir_path", refname);
1189                 goto done;
1190         }
1191 
1192         if (well_known) {
1193                 err = open_ref(ref, path_refs, "", refname, lock);
1194         } else {
1195                 char *packed_refs_path;
1196                 FILE *f;
1197 
1198                 /* Search on-disk refs before packed refs! */
1199                 for (i = 0; i < nitems(subdirs); i++) {
1200                         err = open_ref(ref, path_refs, subdirs[i], refname,
1201                             lock);
1202                         if ((err && err->code != GOT_ERR_NOT_REF) || *ref)
1203                                 goto done;
1204                 }
1205 
1206                 packed_refs_path = got_repo_get_path_packed_refs(repo);
1207                 if (packed_refs_path == NULL) {
1208                         err = got_error_from_errno(
1209                             "got_repo_get_path_packed_refs");
1210                         goto done;
1211                 }
1212 
1213                 if (lock) {
1214                         err = got_lockfile_lock(&lf, packed_refs_path);
1215                         if (err)
1216                                 goto done;
1217                 }
1218                 f = fopen(packed_refs_path, "rb");
1219                 free(packed_refs_path);
1220                 if (f != NULL) {
1221                         err = open_packed_ref(ref, f, subdirs, nitems(subdirs),
1222                             refname);
1223                         if (!err) {
1224                                 if (fclose(f) == EOF) {
1225                                         err = got_error_from_errno("fclose");
1226                                         got_ref_close(*ref);
1227                                         *ref = NULL;
1228                                 } else if (*ref)
1229                                         (*ref)->lf = lf;
1230                         }
1231                 }
1232         }
1233 done:
1234         if (!err && *ref == NULL)
1235                 err = got_error_not_ref(refname);
1236         if (err && lf)
1237                 got_lockfile_unlock(lf);
1238         free(path_refs);
1239         return err;
1240 }
1241 
1242 struct got_reference *
1243 got_ref_dup(struct got_reference *ref)
1244 {
1245         struct got_reference *ret;
1246 
1247         ret = calloc(1, sizeof(*ret));
1248         if (ret == NULL)
1249                 return NULL;
1250 
1251         ret->flags = ref->flags;
1252         if (ref->flags & GOT_REF_IS_SYMBOLIC) {
1253                 ret->ref.symref.name = strdup(ref->ref.symref.name);
1254                 if (ret->ref.symref.name == NULL) {
1255                         free(ret);
1256                         return NULL;
1257                 }
1258                 ret->ref.symref.ref = strdup(ref->ref.symref.ref);
1259                 if (ret->ref.symref.ref == NULL) {
1260                         free(ret->ref.symref.name);
1261                         free(ret);
1262                         return NULL;
1263                 }
1264         } else {
1265                 ret->ref.ref.name = strdup(ref->ref.ref.name);
1266                 if (ret->ref.ref.name == NULL) {
1267                         free(ret);
1268                         return NULL;
1269                 }
1270                 memcpy(ret->ref.ref.sha1, ref->ref.ref.sha1,
1271                     sizeof(ret->ref.ref.sha1));
1272         }
1273 
1274         return ret;
1275 }
1276 
1277 const struct got_error *
1278 got_reflist_entry_dup(struct got_reflist_entry **newp,
1279     struct got_reflist_entry *re)
1280 {
1281         const struct got_error *err = NULL;
1282         struct got_reflist_entry *new;
1283 
1284         *newp = NULL;
1285 
1286         new = malloc(sizeof(*new));
1287         if (new == NULL)
1288                 return got_error_from_errno("malloc");
1289 
1290         new->ref = got_ref_dup(re->ref);
1291         if (new->ref == NULL) {
1292                 err = got_error_from_errno("got_ref_dup");
1293                 free(new);
1294                 return err;
1295         }
1296 
1297         *newp = new;
1298         return NULL;
1299 }
1300 
1301 void
1302 got_ref_list_free(struct got_reflist_head *refs)
1303 {
1304         struct got_reflist_entry *re;
1305 
1306         while ((re = TAILQ_FIRST(refs))) {
1307                 TAILQ_REMOVE(refs, re, entry);
1308                 free(re);
1309         }
1310 
1311 }
1312 EOF
1313 	(cd $testroot/repo && git add reference.c)
1314 	git_commit $testroot/repo -m "added reference.c file"
1315 	local base_commit=`git_show_head $testroot/repo`
1316 
1317 	got checkout $testroot/repo $testroot/wt > /dev/null
1318 	ret="$?"
1319 	if [ "$ret" != "0" ]; then
1320 		test_done "$testroot" "$ret"
1321 		return 1
1322 	fi
1323 
1324 	(cd $testroot/repo && git checkout -q -b newbranch)
1325 	ed -s $testroot/repo/reference.c <<EOF
1326 91a
1327         if (!is_valid_ref_name(name))
1328                 return got_error_path(name, GOT_ERR_BAD_REF_NAME);
1329 
1330 .
1331 w
1332 q
1333 EOF
1334 	git_commit $testroot/repo -m "added lines on newbranch"
1335 	local branch_rev1=`git_show_head $testroot/repo`
1336 
1337 	ed -s $testroot/repo/reference.c <<EOF
1338 255a
1339                 got_ref_close(re->ref);
1340 .
1341 w
1342 q
1343 EOF
1344 	git_commit $testroot/repo -m "more lines on newbranch"
1345 
1346 	local branch_rev2=`git_show_head $testroot/repo`
1347 
1348 	(cd $testroot/wt && got cherrypick $branch_rev2 > $testroot/stdout)
1349 
1350 	echo "G  reference.c" > $testroot/stdout.expected
1351 	echo "Merged commit $branch_rev2" >> $testroot/stdout.expected
1352 
1353 	cmp -s $testroot/stdout.expected $testroot/stdout
1354 	ret="$?"
1355 	if [ "$ret" != "0" ]; then
1356 		diff -u $testroot/stdout.expected $testroot/stdout
1357 		test_done "$testroot" "$ret"
1358 		return 1
1359 	fi
1360 
1361 	cat > $testroot/diff.expected <<EOF
1362 --- reference.c
1363 +++ reference.c
1364 @@ -250,6 +250,7 @@ got_ref_list_free(struct got_reflist_head *refs)
1365  
1366          while ((re = TAILQ_FIRST(refs))) {
1367                  TAILQ_REMOVE(refs, re, entry);
1368 +                got_ref_close(re->ref);
1369                  free(re);
1370          }
1371  
1372 EOF
1373 	(cd $testroot/wt && got diff |
1374 		egrep -v '^(diff|blob|file)' > $testroot/diff)
1375 	cmp -s $testroot/diff.expected $testroot/diff
1376 	ret="$?"
1377 	if [ "$ret" != "0" ]; then
1378 		diff -u $testroot/diff.expected $testroot/diff
1379 	fi
1380 
1381 	test_done "$testroot" "$ret"
1382 }
1383 
1384 test_cherrypick_same_branch() {
1385 	local testroot=`test_init cherrypick_same_branch`
1386 
1387 	got checkout $testroot/repo $testroot/wt > /dev/null
1388 	ret="$?"
1389 	if [ "$ret" != "0" ]; then
1390 		test_done "$testroot" "$ret"
1391 		return 1
1392 	fi
1393 
1394 	(cd $testroot/repo && git checkout -q -b newbranch)
1395 	echo "modified delta on branch" > $testroot/repo/gamma/delta
1396 	git_commit $testroot/repo -m "committing to delta on newbranch"
1397 
1398 	echo "modified alpha on branch" > $testroot/repo/alpha
1399 	(cd $testroot/repo && git rm -q beta)
1400 	echo "new file on branch" > $testroot/repo/epsilon/new
1401 	(cd $testroot/repo && git add epsilon/new)
1402 	git_commit $testroot/repo -m "committing more changes on newbranch"
1403 
1404 	local branch_rev=`git_show_head $testroot/repo`
1405 
1406 	# picking a commit from the branch's own history does not make
1407 	# sense but we should have test coverage for this case regardless
1408 	(cd $testroot/wt && got up -b newbranch > /dev/null)
1409 	(cd $testroot/wt && got cherrypick $branch_rev > $testroot/stdout)
1410 
1411 	echo "G  alpha" > $testroot/stdout.expected
1412 	echo "!  beta" >> $testroot/stdout.expected
1413 	echo "G  epsilon/new" >> $testroot/stdout.expected
1414 	echo "Merged commit $branch_rev" >> $testroot/stdout.expected
1415 	echo -n "Files which had incoming changes but could not be found " \
1416 		>> $testroot/stdout.expected
1417 	echo "in the work tree: 1" >> $testroot/stdout.expected
1418 
1419 	cmp -s $testroot/stdout.expected $testroot/stdout
1420 	ret="$?"
1421 	if [ "$ret" != "0" ]; then
1422 		diff -u $testroot/stdout.expected $testroot/stdout
1423 	fi
1424 	test_done "$testroot" "$ret"
1425 }
1426 
1427 
1428 test_parseargs "$@"
1429 run_test test_cherrypick_basic
1430 run_test test_cherrypick_root_commit
1431 run_test test_cherrypick_into_work_tree_with_conflicts
1432 run_test test_cherrypick_into_work_tree_with_mixed_commits
1433 run_test test_cherrypick_modified_submodule
1434 run_test test_cherrypick_added_submodule
1435 run_test test_cherrypick_conflict_wt_file_vs_repo_submodule
1436 run_test test_cherrypick_modified_symlinks
1437 run_test test_cherrypick_symlink_conflicts
1438 run_test test_cherrypick_with_path_prefix_and_empty_tree
1439 run_test test_cherrypick_conflict_no_eol
1440 run_test test_cherrypick_conflict_no_eol2
1441 run_test test_cherrypick_unrelated_changes
1442 run_test test_cherrypick_same_branch