2014-11-30 08:24:47 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
2015-07-06 17:30:54 +00:00
|
|
|
test_description='test git worktree add'
|
2014-11-30 08:24:47 +00:00
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
test_expect_success 'setup' '
|
|
|
|
test_commit init
|
|
|
|
'
|
|
|
|
|
2015-07-06 17:30:54 +00:00
|
|
|
test_expect_success '"add" an existing worktree' '
|
2014-11-30 08:24:58 +00:00
|
|
|
mkdir -p existing/subtree &&
|
2015-07-06 17:30:54 +00:00
|
|
|
test_must_fail git worktree add --detach existing master
|
2014-11-30 08:24:47 +00:00
|
|
|
'
|
|
|
|
|
2015-07-06 17:30:54 +00:00
|
|
|
test_expect_success '"add" an existing empty worktree' '
|
2014-11-30 08:24:58 +00:00
|
|
|
mkdir existing_empty &&
|
2015-07-06 17:30:54 +00:00
|
|
|
git worktree add --detach existing_empty master
|
2014-11-30 08:24:58 +00:00
|
|
|
'
|
|
|
|
|
2015-07-06 17:30:54 +00:00
|
|
|
test_expect_success '"add" refuses to checkout locked branch' '
|
|
|
|
test_must_fail git worktree add zere master &&
|
2014-11-30 08:24:50 +00:00
|
|
|
! test -d zere &&
|
|
|
|
! test -d .git/worktrees/zere
|
|
|
|
'
|
|
|
|
|
2015-06-12 10:49:24 +00:00
|
|
|
test_expect_success 'checking out paths not complaining about linked checkouts' '
|
|
|
|
(
|
|
|
|
cd existing_empty &&
|
|
|
|
echo dirty >>init.t &&
|
|
|
|
git checkout master -- init.t
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2015-07-06 17:30:54 +00:00
|
|
|
test_expect_success '"add" worktree' '
|
2014-11-30 08:24:49 +00:00
|
|
|
git rev-parse HEAD >expect &&
|
2015-07-06 17:30:54 +00:00
|
|
|
git worktree add --detach here master &&
|
2014-11-30 08:24:47 +00:00
|
|
|
(
|
|
|
|
cd here &&
|
|
|
|
test_cmp ../init.t init.t &&
|
2014-11-30 08:24:49 +00:00
|
|
|
test_must_fail git symbolic-ref HEAD &&
|
|
|
|
git rev-parse HEAD >actual &&
|
|
|
|
test_cmp ../expect actual &&
|
2014-11-30 08:24:47 +00:00
|
|
|
git fsck
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2015-07-06 17:30:54 +00:00
|
|
|
test_expect_success '"add" worktree from a subdir' '
|
2014-11-30 08:24:47 +00:00
|
|
|
(
|
|
|
|
mkdir sub &&
|
|
|
|
cd sub &&
|
2015-07-06 17:30:54 +00:00
|
|
|
git worktree add --detach here master &&
|
2014-11-30 08:24:47 +00:00
|
|
|
cd here &&
|
|
|
|
test_cmp ../../init.t init.t
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2015-07-06 17:30:54 +00:00
|
|
|
test_expect_success '"add" from a linked checkout' '
|
2014-11-30 08:24:47 +00:00
|
|
|
(
|
|
|
|
cd here &&
|
2015-07-06 17:30:54 +00:00
|
|
|
git worktree add --detach nested-here master &&
|
2014-11-30 08:24:47 +00:00
|
|
|
cd nested-here &&
|
|
|
|
git fsck
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2015-07-06 17:30:54 +00:00
|
|
|
test_expect_success '"add" worktree creating new branch' '
|
|
|
|
git worktree add -b newmaster there master &&
|
2014-11-30 08:24:47 +00:00
|
|
|
(
|
|
|
|
cd there &&
|
|
|
|
test_cmp ../init.t init.t &&
|
|
|
|
git symbolic-ref HEAD >actual &&
|
|
|
|
echo refs/heads/newmaster >expect &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
git fsck
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2014-11-30 08:24:49 +00:00
|
|
|
test_expect_success 'die the same branch is already checked out' '
|
|
|
|
(
|
|
|
|
cd here &&
|
|
|
|
test_must_fail git checkout newmaster
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2015-07-17 23:00:03 +00:00
|
|
|
test_expect_success SYMLINKS 'die the same branch is already checked out (symlink)' '
|
|
|
|
head=$(git -C there rev-parse --git-path HEAD) &&
|
|
|
|
ref=$(git -C there symbolic-ref HEAD) &&
|
|
|
|
rm "$head" &&
|
|
|
|
ln -s "$ref" "$head" &&
|
|
|
|
test_must_fail git -C here checkout newmaster
|
|
|
|
'
|
|
|
|
|
2015-01-03 09:41:26 +00:00
|
|
|
test_expect_success 'not die the same branch is already checked out' '
|
|
|
|
(
|
|
|
|
cd here &&
|
2015-07-06 17:30:54 +00:00
|
|
|
git worktree add --force anothernewmaster newmaster
|
2015-01-03 09:41:26 +00:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2014-11-30 08:24:49 +00:00
|
|
|
test_expect_success 'not die on re-checking out current branch' '
|
|
|
|
(
|
|
|
|
cd there &&
|
|
|
|
git checkout newmaster
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2015-07-06 17:30:54 +00:00
|
|
|
test_expect_success '"add" from a bare repo' '
|
2014-11-30 08:24:56 +00:00
|
|
|
(
|
|
|
|
git clone --bare . bare &&
|
|
|
|
cd bare &&
|
2015-07-06 17:30:54 +00:00
|
|
|
git worktree add -b bare-master ../there2 master
|
2014-11-30 08:24:56 +00:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2015-07-06 17:30:54 +00:00
|
|
|
test_expect_success 'checkout from a bare repo without "add"' '
|
2014-11-30 08:24:56 +00:00
|
|
|
(
|
|
|
|
cd bare &&
|
|
|
|
test_must_fail git checkout master
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2014-11-30 08:24:57 +00:00
|
|
|
test_expect_success 'checkout with grafts' '
|
|
|
|
test_when_finished rm .git/info/grafts &&
|
|
|
|
test_commit abc &&
|
2015-12-22 15:05:52 +00:00
|
|
|
SHA1=$(git rev-parse HEAD) &&
|
2014-11-30 08:24:57 +00:00
|
|
|
test_commit def &&
|
|
|
|
test_commit xyz &&
|
2015-12-22 15:05:52 +00:00
|
|
|
echo "$(git rev-parse HEAD) $SHA1" >.git/info/grafts &&
|
2014-11-30 08:24:57 +00:00
|
|
|
cat >expected <<-\EOF &&
|
|
|
|
xyz
|
|
|
|
abc
|
|
|
|
EOF
|
|
|
|
git log --format=%s -2 >actual &&
|
|
|
|
test_cmp expected actual &&
|
2015-07-06 17:30:54 +00:00
|
|
|
git worktree add --detach grafted master &&
|
2014-11-30 08:24:57 +00:00
|
|
|
git --git-dir=grafted/.git log --format=%s -2 >actual &&
|
|
|
|
test_cmp expected actual
|
|
|
|
'
|
|
|
|
|
2015-07-06 17:30:54 +00:00
|
|
|
test_expect_success '"add" from relative HEAD' '
|
2015-07-06 17:30:45 +00:00
|
|
|
test_commit a &&
|
|
|
|
test_commit b &&
|
|
|
|
test_commit c &&
|
|
|
|
git rev-parse HEAD~1 >expected &&
|
2015-07-06 17:30:54 +00:00
|
|
|
git worktree add relhead HEAD~1 &&
|
2015-07-06 17:30:45 +00:00
|
|
|
git -C relhead rev-parse HEAD >actual &&
|
|
|
|
test_cmp expected actual
|
|
|
|
'
|
|
|
|
|
2015-07-06 17:30:58 +00:00
|
|
|
test_expect_success '"add -b" with <branch> omitted' '
|
|
|
|
git worktree add -b burble flornk &&
|
|
|
|
test_cmp_rev HEAD burble
|
|
|
|
'
|
|
|
|
|
2015-07-17 23:00:09 +00:00
|
|
|
test_expect_success '"add --detach" with <branch> omitted' '
|
|
|
|
git worktree add --detach fishhook &&
|
|
|
|
git rev-parse HEAD >expected &&
|
|
|
|
git -C fishhook rev-parse HEAD >actual &&
|
|
|
|
test_cmp expected actual &&
|
|
|
|
test_must_fail git -C fishhook symbolic-ref HEAD
|
|
|
|
'
|
|
|
|
|
2015-07-06 17:30:59 +00:00
|
|
|
test_expect_success '"add" with <branch> omitted' '
|
|
|
|
git worktree add wiffle/bat &&
|
|
|
|
test_cmp_rev HEAD bat
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '"add" auto-vivify does not clobber existing branch' '
|
|
|
|
test_commit c1 &&
|
|
|
|
test_commit c2 &&
|
|
|
|
git branch precious HEAD~1 &&
|
|
|
|
test_must_fail git worktree add precious &&
|
|
|
|
test_cmp_rev HEAD~1 precious &&
|
|
|
|
test_path_is_missing precious
|
|
|
|
'
|
|
|
|
|
2015-07-17 23:00:09 +00:00
|
|
|
test_expect_success '"add" no auto-vivify with --detach and <branch> omitted' '
|
|
|
|
git worktree add --detach mish/mash &&
|
|
|
|
test_must_fail git rev-parse mash -- &&
|
|
|
|
test_must_fail git -C mish/mash symbolic-ref HEAD
|
|
|
|
'
|
|
|
|
|
2015-07-17 23:00:08 +00:00
|
|
|
test_expect_success '"add" -b/-B mutually exclusive' '
|
|
|
|
test_must_fail git worktree add -b poodle -B poodle bamboo master
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '"add" -b/--detach mutually exclusive' '
|
|
|
|
test_must_fail git worktree add -b poodle --detach bamboo master
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '"add" -B/--detach mutually exclusive' '
|
|
|
|
test_must_fail git worktree add -B poodle --detach bamboo master
|
|
|
|
'
|
|
|
|
|
2016-02-15 13:35:33 +00:00
|
|
|
test_expect_success '"add -B" fails if the branch is checked out' '
|
|
|
|
git rev-parse newmaster >before &&
|
|
|
|
test_must_fail git worktree add -B newmaster bamboo master &&
|
|
|
|
git rev-parse newmaster >after &&
|
|
|
|
test_cmp before after
|
|
|
|
'
|
|
|
|
|
2016-02-15 13:35:32 +00:00
|
|
|
test_expect_success 'add -B' '
|
|
|
|
git worktree add -B poodle bamboo2 master^ &&
|
|
|
|
git -C bamboo2 symbolic-ref HEAD >actual &&
|
|
|
|
echo refs/heads/poodle >expected &&
|
|
|
|
test_cmp expected actual &&
|
|
|
|
test_cmp_rev master^ poodle
|
|
|
|
'
|
|
|
|
|
2015-09-28 13:06:15 +00:00
|
|
|
test_expect_success 'local clone from linked checkout' '
|
|
|
|
git clone --local here here-clone &&
|
|
|
|
( cd here-clone && git fsck )
|
|
|
|
'
|
|
|
|
|
2016-03-29 10:11:01 +00:00
|
|
|
test_expect_success '"add" worktree with --no-checkout' '
|
|
|
|
git worktree add --no-checkout -b swamp swamp &&
|
|
|
|
! test -e swamp/init.t &&
|
|
|
|
git -C swamp reset --hard &&
|
|
|
|
test_cmp init.t swamp/init.t
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '"add" worktree with --checkout' '
|
|
|
|
git worktree add --checkout -b swmap2 swamp2 &&
|
|
|
|
test_cmp init.t swamp2/init.t
|
|
|
|
'
|
|
|
|
|
2014-11-30 08:24:47 +00:00
|
|
|
test_done
|