2015-10-08 19:01:05 +02:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='test git worktree list'
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
test_expect_success 'setup' '
|
|
|
|
test_commit init
|
|
|
|
'
|
|
|
|
|
2016-02-12 05:31:45 +01:00
|
|
|
test_expect_success 'rev-parse --git-common-dir on main worktree' '
|
|
|
|
git rev-parse --git-common-dir >actual &&
|
|
|
|
echo .git >expected &&
|
|
|
|
test_cmp expected actual &&
|
|
|
|
mkdir sub &&
|
|
|
|
git -C sub rev-parse --git-common-dir >actual2 &&
|
|
|
|
echo sub/.git >expected2 &&
|
|
|
|
test_cmp expected2 actual2
|
|
|
|
'
|
|
|
|
|
2015-10-08 19:01:05 +02:00
|
|
|
test_expect_success '"list" all worktrees from main' '
|
|
|
|
echo "$(git rev-parse --show-toplevel) $(git rev-parse --short HEAD) [$(git symbolic-ref --short HEAD)]" >expect &&
|
|
|
|
test_when_finished "rm -rf here && git worktree prune" &&
|
|
|
|
git worktree add --detach here master &&
|
|
|
|
echo "$(git -C here rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >>expect &&
|
|
|
|
git worktree list | sed "s/ */ /g" >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '"list" all worktrees from linked' '
|
|
|
|
echo "$(git rev-parse --show-toplevel) $(git rev-parse --short HEAD) [$(git symbolic-ref --short HEAD)]" >expect &&
|
|
|
|
test_when_finished "rm -rf here && git worktree prune" &&
|
|
|
|
git worktree add --detach here master &&
|
|
|
|
echo "$(git -C here rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >>expect &&
|
|
|
|
git -C here worktree list | sed "s/ */ /g" >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '"list" all worktrees --porcelain' '
|
|
|
|
echo "worktree $(git rev-parse --show-toplevel)" >expect &&
|
|
|
|
echo "HEAD $(git rev-parse HEAD)" >>expect &&
|
|
|
|
echo "branch $(git symbolic-ref HEAD)" >>expect &&
|
|
|
|
echo >>expect &&
|
|
|
|
test_when_finished "rm -rf here && git worktree prune" &&
|
|
|
|
git worktree add --detach here master &&
|
|
|
|
echo "worktree $(git -C here rev-parse --show-toplevel)" >>expect &&
|
|
|
|
echo "HEAD $(git rev-parse HEAD)" >>expect &&
|
|
|
|
echo "detached" >>expect &&
|
|
|
|
echo >>expect &&
|
|
|
|
git worktree list --porcelain >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'bare repo setup' '
|
|
|
|
git init --bare bare1 &&
|
|
|
|
echo "data" >file1 &&
|
|
|
|
git add file1 &&
|
|
|
|
git commit -m"File1: add data" &&
|
|
|
|
git push bare1 master &&
|
|
|
|
git reset --hard HEAD^
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '"list" all worktrees from bare main' '
|
|
|
|
test_when_finished "rm -rf there && git -C bare1 worktree prune" &&
|
|
|
|
git -C bare1 worktree add --detach ../there master &&
|
|
|
|
echo "$(pwd)/bare1 (bare)" >expect &&
|
|
|
|
echo "$(git -C there rev-parse --show-toplevel) $(git -C there rev-parse --short HEAD) (detached HEAD)" >>expect &&
|
|
|
|
git -C bare1 worktree list | sed "s/ */ /g" >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '"list" all worktrees --porcelain from bare main' '
|
|
|
|
test_when_finished "rm -rf there && git -C bare1 worktree prune" &&
|
|
|
|
git -C bare1 worktree add --detach ../there master &&
|
|
|
|
echo "worktree $(pwd)/bare1" >expect &&
|
|
|
|
echo "bare" >>expect &&
|
|
|
|
echo >>expect &&
|
|
|
|
echo "worktree $(git -C there rev-parse --show-toplevel)" >>expect &&
|
|
|
|
echo "HEAD $(git -C there rev-parse HEAD)" >>expect &&
|
|
|
|
echo "detached" >>expect &&
|
|
|
|
echo >>expect &&
|
|
|
|
git -C bare1 worktree list --porcelain >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '"list" all worktrees from linked with a bare main' '
|
|
|
|
test_when_finished "rm -rf there && git -C bare1 worktree prune" &&
|
|
|
|
git -C bare1 worktree add --detach ../there master &&
|
|
|
|
echo "$(pwd)/bare1 (bare)" >expect &&
|
|
|
|
echo "$(git -C there rev-parse --show-toplevel) $(git -C there rev-parse --short HEAD) (detached HEAD)" >>expect &&
|
|
|
|
git -C there worktree list | sed "s/ */ /g" >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'bare repo cleanup' '
|
|
|
|
rm -rf bare1
|
|
|
|
'
|
|
|
|
|
get_worktrees() must return main worktree as first item even on error
This is required by git-worktree.txt, stating that the main worktree is
the first line (especially in --porcelain mode when we can't just change
behavior at will).
There's only one case when get_worktrees() may skip main worktree, when
parse_ref() fails. Update the code so that we keep first item as main
worktree and return something sensible in this case:
- In user-friendly mode, since we're not constraint by anything,
returning "(error)" should do the job (we already show "(detached
HEAD)" which is not machine-friendly). Actually errors should be
printed on stderr by parse_ref() (*)
- In plumbing mode, we do not show neither 'bare', 'detached' or
'branch ...', which is possible by the format description if I read
it right.
Careful readers may realize that when the local variable "head_ref" in
get_main_worktree() is emptied, add_head_info() will do nothing to
wt->head_sha1. But that's ok because head_sha1 is zero-ized in the
previous patch.
(*) Well, it does not. But it's supposed to be a stop gap implementation
until we can reuse refs code to parse "ref: " stuff in HEAD, from
resolve_refs_unsafe(). Now may be the time since refs refactoring is
mostly done.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-11-28 10:36:54 +01:00
|
|
|
test_expect_success 'broken main worktree still at the top' '
|
|
|
|
git init broken-main &&
|
|
|
|
(
|
|
|
|
cd broken-main &&
|
|
|
|
test_commit new &&
|
|
|
|
git worktree add linked &&
|
|
|
|
cat >expected <<-EOF &&
|
|
|
|
worktree $(pwd)
|
|
|
|
HEAD $_z40
|
|
|
|
|
|
|
|
EOF
|
|
|
|
cd linked &&
|
|
|
|
echo "worktree $(pwd)" >expected &&
|
|
|
|
echo "ref: .broken" >../.git/HEAD &&
|
|
|
|
git worktree list --porcelain | head -n 3 >actual &&
|
|
|
|
test_cmp ../expected actual &&
|
|
|
|
git worktree list | head -n 1 >actual.2 &&
|
|
|
|
grep -F "(error)" actual.2
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2015-10-08 19:01:05 +02:00
|
|
|
test_done
|