worktree: add --quiet option
[git/git.git] / t / t2025-worktree-add.sh
CommitLineData
529fef20
NTND
1#!/bin/sh
2
f194b1ef 3test_description='test git worktree add'
529fef20
NTND
4
5. ./test-lib.sh
6
8d9fdd70
NTND
7. "$TEST_DIRECTORY"/lib-rebase.sh
8
529fef20
NTND
9test_expect_success 'setup' '
10 test_commit init
11'
12
f194b1ef 13test_expect_success '"add" an existing worktree' '
ee4fb843 14 mkdir -p existing/subtree &&
f194b1ef 15 test_must_fail git worktree add --detach existing master
529fef20
NTND
16'
17
f194b1ef 18test_expect_success '"add" an existing empty worktree' '
ee4fb843 19 mkdir existing_empty &&
f194b1ef 20 git worktree add --detach existing_empty master
ee4fb843
MK
21'
22
1a450e2f
JDG
23test_expect_success '"add" using shorthand - fails when no previous branch' '
24 test_must_fail git worktree add existing_short -
25'
26
27test_expect_success '"add" using - shorthand' '
28 git checkout -b newbranch &&
29 echo hello >myworld &&
30 git add myworld &&
31 git commit -m myworld &&
32 git checkout master &&
33 git worktree add short-hand - &&
34 echo refs/heads/newbranch >expect &&
35 git -C short-hand rev-parse --symbolic-full-name HEAD >actual &&
36 test_cmp expect actual
37'
38
f194b1ef
ES
39test_expect_success '"add" refuses to checkout locked branch' '
40 test_must_fail git worktree add zere master &&
3b8925c7
NTND
41 ! test -d zere &&
42 ! test -d .git/worktrees/zere
43'
44
e1c1ab9d
NTND
45test_expect_success 'checking out paths not complaining about linked checkouts' '
46 (
47 cd existing_empty &&
48 echo dirty >>init.t &&
49 git checkout master -- init.t
50 )
51'
52
f194b1ef 53test_expect_success '"add" worktree' '
5883034c 54 git rev-parse HEAD >expect &&
f194b1ef 55 git worktree add --detach here master &&
529fef20
NTND
56 (
57 cd here &&
58 test_cmp ../init.t init.t &&
5883034c
NTND
59 test_must_fail git symbolic-ref HEAD &&
60 git rev-parse HEAD >actual &&
61 test_cmp ../expect actual &&
529fef20
NTND
62 git fsck
63 )
64'
65
507e6e9e
NTND
66test_expect_success '"add" worktree with lock' '
67 git rev-parse HEAD >expect &&
68 git worktree add --detach --lock here-with-lock master &&
69 test -f .git/worktrees/here-with-lock/locked
70'
71
f194b1ef 72test_expect_success '"add" worktree from a subdir' '
529fef20
NTND
73 (
74 mkdir sub &&
75 cd sub &&
f194b1ef 76 git worktree add --detach here master &&
529fef20
NTND
77 cd here &&
78 test_cmp ../../init.t init.t
79 )
80'
81
f194b1ef 82test_expect_success '"add" from a linked checkout' '
529fef20
NTND
83 (
84 cd here &&
f194b1ef 85 git worktree add --detach nested-here master &&
529fef20
NTND
86 cd nested-here &&
87 git fsck
88 )
89'
90
f194b1ef
ES
91test_expect_success '"add" worktree creating new branch' '
92 git worktree add -b newmaster there master &&
529fef20
NTND
93 (
94 cd there &&
95 test_cmp ../init.t init.t &&
96 git symbolic-ref HEAD >actual &&
97 echo refs/heads/newmaster >expect &&
98 test_cmp expect actual &&
99 git fsck
100 )
101'
102
5883034c
NTND
103test_expect_success 'die the same branch is already checked out' '
104 (
105 cd here &&
106 test_must_fail git checkout newmaster
107 )
108'
109
746bbdc6
ES
110test_expect_success SYMLINKS 'die the same branch is already checked out (symlink)' '
111 head=$(git -C there rev-parse --git-path HEAD) &&
112 ref=$(git -C there symbolic-ref HEAD) &&
113 rm "$head" &&
114 ln -s "$ref" "$head" &&
115 test_must_fail git -C here checkout newmaster
116'
117
1d0fa898
NTND
118test_expect_success 'not die the same branch is already checked out' '
119 (
120 cd here &&
f194b1ef 121 git worktree add --force anothernewmaster newmaster
1d0fa898
NTND
122 )
123'
124
5883034c
NTND
125test_expect_success 'not die on re-checking out current branch' '
126 (
127 cd there &&
128 git checkout newmaster
129 )
130'
131
f194b1ef 132test_expect_success '"add" from a bare repo' '
3473ad0c
DK
133 (
134 git clone --bare . bare &&
135 cd bare &&
f194b1ef 136 git worktree add -b bare-master ../there2 master
3473ad0c
DK
137 )
138'
139
f194b1ef 140test_expect_success 'checkout from a bare repo without "add"' '
3473ad0c
DK
141 (
142 cd bare &&
143 test_must_fail git checkout master
144 )
145'
146
171c646f
DK
147test_expect_success '"add" default branch of a bare repo' '
148 (
149 git clone --bare . bare2 &&
150 cd bare2 &&
151 git worktree add ../there3 master
152 )
153'
154
ad35f615
NTND
155test_expect_success 'checkout with grafts' '
156 test_when_finished rm .git/info/grafts &&
157 test_commit abc &&
697b90d7 158 SHA1=$(git rev-parse HEAD) &&
ad35f615
NTND
159 test_commit def &&
160 test_commit xyz &&
697b90d7 161 echo "$(git rev-parse HEAD) $SHA1" >.git/info/grafts &&
ad35f615
NTND
162 cat >expected <<-\EOF &&
163 xyz
164 abc
165 EOF
166 git log --format=%s -2 >actual &&
167 test_cmp expected actual &&
f194b1ef 168 git worktree add --detach grafted master &&
ad35f615
NTND
169 git --git-dir=grafted/.git log --format=%s -2 >actual &&
170 test_cmp expected actual
171'
172
f194b1ef 173test_expect_success '"add" from relative HEAD' '
c990a4c1
ES
174 test_commit a &&
175 test_commit b &&
176 test_commit c &&
177 git rev-parse HEAD~1 >expected &&
f194b1ef 178 git worktree add relhead HEAD~1 &&
c990a4c1
ES
179 git -C relhead rev-parse HEAD >actual &&
180 test_cmp expected actual
181'
182
0f4af3b9
ES
183test_expect_success '"add -b" with <branch> omitted' '
184 git worktree add -b burble flornk &&
185 test_cmp_rev HEAD burble
186'
187
5c942570
ES
188test_expect_success '"add --detach" with <branch> omitted' '
189 git worktree add --detach fishhook &&
190 git rev-parse HEAD >expected &&
191 git -C fishhook rev-parse HEAD >actual &&
192 test_cmp expected actual &&
193 test_must_fail git -C fishhook symbolic-ref HEAD
194'
195
1eb07d82
ES
196test_expect_success '"add" with <branch> omitted' '
197 git worktree add wiffle/bat &&
198 test_cmp_rev HEAD bat
199'
200
f60a7b76
TG
201test_expect_success '"add" checks out existing branch of dwimd name' '
202 git branch dwim HEAD~1 &&
203 git worktree add dwim &&
204 test_cmp_rev HEAD~1 dwim &&
205 (
206 cd dwim &&
207 test_cmp_rev HEAD dwim
208 )
209'
210
211test_expect_success '"add <path>" dwim fails with checked out branch' '
212 git checkout -b test-branch &&
213 test_must_fail git worktree add test-branch &&
214 test_path_is_missing test-branch
215'
216
217test_expect_success '"add --force" with existing dwimd name doesnt die' '
218 git checkout test-branch &&
219 git worktree add --force test-branch
1eb07d82
ES
220'
221
5c942570
ES
222test_expect_success '"add" no auto-vivify with --detach and <branch> omitted' '
223 git worktree add --detach mish/mash &&
224 test_must_fail git rev-parse mash -- &&
225 test_must_fail git -C mish/mash symbolic-ref HEAD
226'
227
ab0b2c53
ES
228test_expect_success '"add" -b/-B mutually exclusive' '
229 test_must_fail git worktree add -b poodle -B poodle bamboo master
230'
231
232test_expect_success '"add" -b/--detach mutually exclusive' '
233 test_must_fail git worktree add -b poodle --detach bamboo master
234'
235
236test_expect_success '"add" -B/--detach mutually exclusive' '
237 test_must_fail git worktree add -B poodle --detach bamboo master
238'
239
beb6f24b
NTND
240test_expect_success '"add -B" fails if the branch is checked out' '
241 git rev-parse newmaster >before &&
242 test_must_fail git worktree add -B newmaster bamboo master &&
243 git rev-parse newmaster >after &&
244 test_cmp before after
245'
246
0ebf4a2a
NTND
247test_expect_success 'add -B' '
248 git worktree add -B poodle bamboo2 master^ &&
249 git -C bamboo2 symbolic-ref HEAD >actual &&
250 echo refs/heads/poodle >expected &&
251 test_cmp expected actual &&
252 test_cmp_rev master^ poodle
253'
254
371979c2
EP
255test_expect_success 'add --quiet' '
256 git worktree add --quiet another-worktree master 2>actual &&
257 test_must_be_empty actual
258'
259
744e4697
NTND
260test_expect_success 'local clone from linked checkout' '
261 git clone --local here here-clone &&
262 ( cd here-clone && git fsck )
263'
264
b3b05971
ES
265test_expect_success 'local clone --shared from linked checkout' '
266 git -C bare worktree add --detach ../baretree &&
267 git clone --local --shared baretree bare-clone &&
268 grep /bare/ bare-clone/.git/objects/info/alternates
269'
270
ef2a0ac9
RZ
271test_expect_success '"add" worktree with --no-checkout' '
272 git worktree add --no-checkout -b swamp swamp &&
273 ! test -e swamp/init.t &&
274 git -C swamp reset --hard &&
275 test_cmp init.t swamp/init.t
276'
277
278test_expect_success '"add" worktree with --checkout' '
279 git worktree add --checkout -b swmap2 swamp2 &&
280 test_cmp init.t swamp2/init.t
281'
282
8d9fdd70
NTND
283test_expect_success 'put a worktree under rebase' '
284 git worktree add under-rebase &&
285 (
286 cd under-rebase &&
287 set_fake_editor &&
288 FAKE_LINES="edit 1" git rebase -i HEAD^ &&
289 git worktree list | grep "under-rebase.*detached HEAD"
290 )
291'
292
293test_expect_success 'add a worktree, checking out a rebased branch' '
294 test_must_fail git worktree add new-rebase under-rebase &&
295 ! test -d new-rebase
296'
297
298test_expect_success 'checking out a rebased branch from another worktree' '
299 git worktree add new-place &&
300 test_must_fail git -C new-place checkout under-rebase
301'
302
303test_expect_success 'not allow to delete a branch under rebase' '
304 (
305 cd under-rebase &&
306 test_must_fail git branch -D under-rebase
307 )
308'
309
14ace5b7
NTND
310test_expect_success 'rename a branch under rebase not allowed' '
311 test_must_fail git branch -M under-rebase rebase-with-new-name
312'
313
8d9fdd70
NTND
314test_expect_success 'check out from current worktree branch ok' '
315 (
316 cd under-rebase &&
317 git checkout under-rebase &&
318 git checkout - &&
319 git rebase --abort
320 )
321'
322
04a3dfb8
NTND
323test_expect_success 'checkout a branch under bisect' '
324 git worktree add under-bisect &&
325 (
326 cd under-bisect &&
327 git bisect start &&
328 git bisect bad &&
329 git bisect good HEAD~2 &&
330 git worktree list | grep "under-bisect.*detached HEAD" &&
331 test_must_fail git worktree add new-bisect under-bisect &&
332 ! test -d new-bisect
333 )
334'
335
14ace5b7
NTND
336test_expect_success 'rename a branch under bisect not allowed' '
337 test_must_fail git branch -M under-bisect bisect-with-new-name
338'
e284e892
TG
339# Is branch "refs/heads/$1" set to pull from "$2/$3"?
340test_branch_upstream () {
341 printf "%s\n" "$2" "refs/heads/$3" >expect.upstream &&
342 {
343 git config "branch.$1.remote" &&
344 git config "branch.$1.merge"
345 } >actual.upstream &&
346 test_cmp expect.upstream actual.upstream
347}
348
349test_expect_success '--track sets up tracking' '
350 test_when_finished rm -rf track &&
351 git worktree add --track -b track track master &&
352 test_branch_upstream track . master
353'
354
355# setup remote repository $1 and repository $2 with $1 set up as
356# remote. The remote has two branches, master and foo.
357setup_remote_repo () {
358 git init $1 &&
359 (
360 cd $1 &&
361 test_commit $1_master &&
362 git checkout -b foo &&
363 test_commit upstream_foo
364 ) &&
365 git init $2 &&
366 (
367 cd $2 &&
368 test_commit $2_master &&
369 git remote add $1 ../$1 &&
370 git config remote.$1.fetch \
371 "refs/heads/*:refs/remotes/$1/*" &&
372 git fetch --all
373 )
374}
375
376test_expect_success '--no-track avoids setting up tracking' '
377 test_when_finished rm -rf repo_upstream repo_local foo &&
378 setup_remote_repo repo_upstream repo_local &&
379 (
380 cd repo_local &&
381 git worktree add --no-track -b foo ../foo repo_upstream/foo
382 ) &&
383 (
384 cd foo &&
385 test_must_fail git config "branch.foo.remote" &&
386 test_must_fail git config "branch.foo.merge" &&
387 test_cmp_rev refs/remotes/repo_upstream/foo refs/heads/foo
388 )
389'
14ace5b7 390
4e853331
TG
391test_expect_success '"add" <path> <non-existent-branch> fails' '
392 test_must_fail git worktree add foo non-existent
393'
394
395test_expect_success '"add" <path> <branch> dwims' '
396 test_when_finished rm -rf repo_upstream repo_dwim foo &&
397 setup_remote_repo repo_upstream repo_dwim &&
398 git init repo_dwim &&
399 (
400 cd repo_dwim &&
401 git worktree add ../foo foo
402 ) &&
403 (
404 cd foo &&
405 test_branch_upstream foo repo_upstream foo &&
406 test_cmp_rev refs/remotes/repo_upstream/foo refs/heads/foo
407 )
408'
409
8d7b558b
ÆAB
410test_expect_success '"add" <path> <branch> dwims with checkout.defaultRemote' '
411 test_when_finished rm -rf repo_upstream repo_dwim foo &&
412 setup_remote_repo repo_upstream repo_dwim &&
413 git init repo_dwim &&
414 (
415 cd repo_dwim &&
416 git remote add repo_upstream2 ../repo_upstream &&
417 git fetch repo_upstream2 &&
418 test_must_fail git worktree add ../foo foo &&
419 git -c checkout.defaultRemote=repo_upstream worktree add ../foo foo &&
420 >status.expect &&
421 git status -uno --porcelain >status.actual &&
422 test_cmp status.expect status.actual
423 ) &&
424 (
425 cd foo &&
426 test_branch_upstream foo repo_upstream foo &&
427 test_cmp_rev refs/remotes/repo_upstream/foo refs/heads/foo
428 )
429'
430
71d6682d
TG
431test_expect_success 'git worktree add does not match remote' '
432 test_when_finished rm -rf repo_a repo_b foo &&
433 setup_remote_repo repo_a repo_b &&
434 (
435 cd repo_b &&
436 git worktree add ../foo
437 ) &&
438 (
439 cd foo &&
440 test_must_fail git config "branch.foo.remote" &&
441 test_must_fail git config "branch.foo.merge" &&
442 ! test_cmp_rev refs/remotes/repo_a/foo refs/heads/foo
443 )
444'
445
446test_expect_success 'git worktree add --guess-remote sets up tracking' '
447 test_when_finished rm -rf repo_a repo_b foo &&
448 setup_remote_repo repo_a repo_b &&
449 (
450 cd repo_b &&
451 git worktree add --guess-remote ../foo
452 ) &&
453 (
454 cd foo &&
455 test_branch_upstream foo repo_a foo &&
456 test_cmp_rev refs/remotes/repo_a/foo refs/heads/foo
457 )
458'
459
e92445a7
TG
460test_expect_success 'git worktree add with worktree.guessRemote sets up tracking' '
461 test_when_finished rm -rf repo_a repo_b foo &&
462 setup_remote_repo repo_a repo_b &&
463 (
464 cd repo_b &&
465 git config worktree.guessRemote true &&
466 git worktree add ../foo
467 ) &&
468 (
469 cd foo &&
470 test_branch_upstream foo repo_a foo &&
471 test_cmp_rev refs/remotes/repo_a/foo refs/heads/foo
472 )
473'
474
475test_expect_success 'git worktree --no-guess-remote option overrides config' '
476 test_when_finished rm -rf repo_a repo_b foo &&
477 setup_remote_repo repo_a repo_b &&
478 (
479 cd repo_b &&
480 git config worktree.guessRemote true &&
481 git worktree add --no-guess-remote ../foo
482 ) &&
483 (
484 cd foo &&
485 test_must_fail git config "branch.foo.remote" &&
486 test_must_fail git config "branch.foo.merge" &&
487 ! test_cmp_rev refs/remotes/repo_a/foo refs/heads/foo
488 )
489'
490
ade546be 491post_checkout_hook () {
a4bf1e3c
ES
492 gitdir=${1:-.git}
493 test_when_finished "rm -f $gitdir/hooks/post-checkout" &&
494 mkdir -p $gitdir/hooks &&
495 write_script $gitdir/hooks/post-checkout <<-\EOF
496 {
497 echo $*
498 git rev-parse --git-dir --show-toplevel
499 } >hook.actual
ade546be
ES
500 EOF
501}
502
503test_expect_success '"add" invokes post-checkout hook (branch)' '
504 post_checkout_hook &&
a4bf1e3c 505 {
8125a58b 506 echo $ZERO_OID $(git rev-parse HEAD) 1 &&
a4bf1e3c
ES
507 echo $(pwd)/.git/worktrees/gumby &&
508 echo $(pwd)/gumby
509 } >hook.expect &&
ade546be 510 git worktree add gumby &&
a4bf1e3c 511 test_cmp hook.expect gumby/hook.actual
ade546be
ES
512'
513
514test_expect_success '"add" invokes post-checkout hook (detached)' '
515 post_checkout_hook &&
a4bf1e3c 516 {
8125a58b 517 echo $ZERO_OID $(git rev-parse HEAD) 1 &&
a4bf1e3c
ES
518 echo $(pwd)/.git/worktrees/grumpy &&
519 echo $(pwd)/grumpy
520 } >hook.expect &&
ade546be 521 git worktree add --detach grumpy &&
a4bf1e3c 522 test_cmp hook.expect grumpy/hook.actual
ade546be
ES
523'
524
525test_expect_success '"add --no-checkout" suppresses post-checkout hook' '
526 post_checkout_hook &&
527 rm -f hook.actual &&
528 git worktree add --no-checkout gloopy &&
a4bf1e3c
ES
529 test_path_is_missing gloopy/hook.actual
530'
531
532test_expect_success '"add" in other worktree invokes post-checkout hook' '
533 post_checkout_hook &&
534 {
8125a58b 535 echo $ZERO_OID $(git rev-parse HEAD) 1 &&
a4bf1e3c
ES
536 echo $(pwd)/.git/worktrees/guppy &&
537 echo $(pwd)/guppy
538 } >hook.expect &&
539 git -C gloopy worktree add --detach ../guppy &&
540 test_cmp hook.expect guppy/hook.actual
541'
542
543test_expect_success '"add" in bare repo invokes post-checkout hook' '
544 rm -rf bare &&
545 git clone --bare . bare &&
546 {
8125a58b 547 echo $ZERO_OID $(git --git-dir=bare rev-parse HEAD) 1 &&
a4bf1e3c
ES
548 echo $(pwd)/bare/worktrees/goozy &&
549 echo $(pwd)/goozy
550 } >hook.expect &&
551 post_checkout_hook bare &&
552 git -C bare worktree add --detach ../goozy &&
553 test_cmp hook.expect goozy/hook.actual
ade546be
ES
554'
555
529fef20 556test_done