mirror of
https://github.com/git/git.git
synced 2024-11-27 03:53:55 +08:00
6789275d37
They are equivalents and the former still exists, so as long as the
only change this commit makes are to rewrite test_i18ngrep to
test_grep, there won't be any new bug, even if there still are
callers of test_i18ngrep remaining in the tree, or when merged to
other topics that add new uses of test_i18ngrep.
This patch was produced more or less with
git grep -l -e 'test_i18ngrep ' 't/t[0-9][0-9][0-9][0-9]-*.sh' |
xargs perl -p -i -e 's/test_i18ngrep /test_grep /'
and a good way to sanity check the result yourself is to run the
above in a checkout of c4603c1c (test framework: further deprecate
test_i18ngrep, 2023-10-31) and compare the resulting working tree
contents with the result of applying this patch to the same commit.
You'll see that test_i18ngrep in a few t/lib-*.sh files corrected,
in addition to the manual reproduction.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
251 lines
6.8 KiB
Bash
Executable File
251 lines
6.8 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='test git worktree move, remove, lock and unlock'
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
test_commit init &&
|
|
git worktree add source &&
|
|
git worktree list --porcelain >out &&
|
|
grep "^worktree" out >actual &&
|
|
cat <<-EOF >expected &&
|
|
worktree $(pwd)
|
|
worktree $(pwd)/source
|
|
EOF
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'lock main worktree' '
|
|
test_must_fail git worktree lock .
|
|
'
|
|
|
|
test_expect_success 'lock linked worktree' '
|
|
git worktree lock --reason hahaha source &&
|
|
echo hahaha >expected &&
|
|
test_cmp expected .git/worktrees/source/locked
|
|
'
|
|
|
|
test_expect_success 'lock linked worktree from another worktree' '
|
|
rm .git/worktrees/source/locked &&
|
|
git worktree add elsewhere &&
|
|
git -C elsewhere worktree lock --reason hahaha ../source &&
|
|
echo hahaha >expected &&
|
|
test_cmp expected .git/worktrees/source/locked
|
|
'
|
|
|
|
test_expect_success 'lock worktree twice' '
|
|
test_must_fail git worktree lock source &&
|
|
echo hahaha >expected &&
|
|
test_cmp expected .git/worktrees/source/locked
|
|
'
|
|
|
|
test_expect_success 'lock worktree twice (from the locked worktree)' '
|
|
test_must_fail git -C source worktree lock . &&
|
|
echo hahaha >expected &&
|
|
test_cmp expected .git/worktrees/source/locked
|
|
'
|
|
|
|
test_expect_success 'unlock main worktree' '
|
|
test_must_fail git worktree unlock .
|
|
'
|
|
|
|
test_expect_success 'unlock linked worktree' '
|
|
git worktree unlock source &&
|
|
test_path_is_missing .git/worktrees/source/locked
|
|
'
|
|
|
|
test_expect_success 'unlock worktree twice' '
|
|
test_must_fail git worktree unlock source &&
|
|
test_path_is_missing .git/worktrees/source/locked
|
|
'
|
|
|
|
test_expect_success 'move non-worktree' '
|
|
mkdir abc &&
|
|
test_must_fail git worktree move abc def
|
|
'
|
|
|
|
test_expect_success 'move locked worktree' '
|
|
git worktree lock source &&
|
|
test_when_finished "git worktree unlock source" &&
|
|
test_must_fail git worktree move source destination
|
|
'
|
|
|
|
test_expect_success 'move worktree' '
|
|
git worktree move source destination &&
|
|
test_path_is_missing source &&
|
|
git worktree list --porcelain >out &&
|
|
grep "^worktree.*/destination$" out &&
|
|
! grep "^worktree.*/source$" out &&
|
|
git -C destination log --format=%s >actual2 &&
|
|
echo init >expected2 &&
|
|
test_cmp expected2 actual2
|
|
'
|
|
|
|
test_expect_success 'move main worktree' '
|
|
test_must_fail git worktree move . def
|
|
'
|
|
|
|
test_expect_success 'move worktree to another dir' '
|
|
mkdir some-dir &&
|
|
git worktree move destination some-dir &&
|
|
test_when_finished "git worktree move some-dir/destination destination" &&
|
|
test_path_is_missing destination &&
|
|
git worktree list --porcelain >out &&
|
|
grep "^worktree.*/some-dir/destination$" out &&
|
|
git -C some-dir/destination log --format=%s >actual2 &&
|
|
echo init >expected2 &&
|
|
test_cmp expected2 actual2
|
|
'
|
|
|
|
test_expect_success 'move locked worktree (force)' '
|
|
test_when_finished "
|
|
git worktree unlock flump || :
|
|
git worktree remove flump || :
|
|
git worktree unlock ploof || :
|
|
git worktree remove ploof || :
|
|
" &&
|
|
git worktree add --detach flump &&
|
|
git worktree lock flump &&
|
|
test_must_fail git worktree move flump ploof" &&
|
|
test_must_fail git worktree move --force flump ploof" &&
|
|
git worktree move --force --force flump ploof
|
|
'
|
|
|
|
test_expect_success 'refuse to move worktree atop existing path' '
|
|
>bobble &&
|
|
git worktree add --detach beeble &&
|
|
test_must_fail git worktree move beeble bobble
|
|
'
|
|
|
|
test_expect_success 'move atop existing but missing worktree' '
|
|
git worktree add --detach gnoo &&
|
|
git worktree add --detach pneu &&
|
|
rm -fr pneu &&
|
|
test_must_fail git worktree move gnoo pneu &&
|
|
git worktree move --force gnoo pneu &&
|
|
|
|
git worktree add --detach nu &&
|
|
git worktree lock nu &&
|
|
rm -fr nu &&
|
|
test_must_fail git worktree move pneu nu &&
|
|
test_must_fail git worktree --force move pneu nu &&
|
|
git worktree move --force --force pneu nu
|
|
'
|
|
|
|
test_expect_success 'move a repo with uninitialized submodule' '
|
|
git init withsub &&
|
|
(
|
|
cd withsub &&
|
|
test_commit initial &&
|
|
git -c protocol.file.allow=always \
|
|
submodule add "$PWD"/.git sub &&
|
|
git commit -m withsub &&
|
|
git worktree add second HEAD &&
|
|
git worktree move second third
|
|
)
|
|
'
|
|
|
|
test_expect_success 'not move a repo with initialized submodule' '
|
|
(
|
|
cd withsub &&
|
|
git -c protocol.file.allow=always -C third submodule update &&
|
|
test_must_fail git worktree move third forth
|
|
)
|
|
'
|
|
|
|
test_expect_success 'remove main worktree' '
|
|
test_must_fail git worktree remove .
|
|
'
|
|
|
|
test_expect_success 'remove locked worktree' '
|
|
git worktree lock destination &&
|
|
test_when_finished "git worktree unlock destination" &&
|
|
test_must_fail git worktree remove destination
|
|
'
|
|
|
|
test_expect_success 'remove worktree with dirty tracked file' '
|
|
echo dirty >>destination/init.t &&
|
|
test_when_finished "git -C destination checkout init.t" &&
|
|
test_must_fail git worktree remove destination
|
|
'
|
|
|
|
test_expect_success 'remove worktree with untracked file' '
|
|
: >destination/untracked &&
|
|
test_must_fail git worktree remove destination
|
|
'
|
|
|
|
test_expect_success 'force remove worktree with untracked file' '
|
|
git worktree remove --force destination &&
|
|
test_path_is_missing destination
|
|
'
|
|
|
|
test_expect_success 'remove missing worktree' '
|
|
git worktree add to-be-gone &&
|
|
test -d .git/worktrees/to-be-gone &&
|
|
mv to-be-gone gone &&
|
|
git worktree remove to-be-gone &&
|
|
test_path_is_missing .git/worktrees/to-be-gone
|
|
'
|
|
|
|
test_expect_success 'NOT remove missing-but-locked worktree' '
|
|
git worktree add gone-but-locked &&
|
|
git worktree lock gone-but-locked &&
|
|
test -d .git/worktrees/gone-but-locked &&
|
|
mv gone-but-locked really-gone-now &&
|
|
test_must_fail git worktree remove gone-but-locked &&
|
|
test_path_is_dir .git/worktrees/gone-but-locked
|
|
'
|
|
|
|
test_expect_success 'proper error when worktree not found' '
|
|
for i in noodle noodle/bork
|
|
do
|
|
test_must_fail git worktree lock $i 2>err &&
|
|
test_grep "not a working tree" err || return 1
|
|
done
|
|
'
|
|
|
|
test_expect_success 'remove locked worktree (force)' '
|
|
git worktree add --detach gumby &&
|
|
test_when_finished "git worktree remove gumby || :" &&
|
|
git worktree lock gumby &&
|
|
test_when_finished "git worktree unlock gumby || :" &&
|
|
test_must_fail git worktree remove gumby &&
|
|
test_must_fail git worktree remove --force gumby &&
|
|
git worktree remove --force --force gumby
|
|
'
|
|
|
|
test_expect_success 'remove cleans up .git/worktrees when empty' '
|
|
git init moog &&
|
|
(
|
|
cd moog &&
|
|
test_commit bim &&
|
|
git worktree add --detach goom &&
|
|
test_path_exists .git/worktrees &&
|
|
git worktree remove goom &&
|
|
test_path_is_missing .git/worktrees
|
|
)
|
|
'
|
|
|
|
test_expect_success 'remove a repo with uninitialized submodule' '
|
|
test_config_global protocol.file.allow always &&
|
|
(
|
|
cd withsub &&
|
|
git worktree add to-remove HEAD &&
|
|
git worktree remove to-remove
|
|
)
|
|
'
|
|
|
|
test_expect_success 'not remove a repo with initialized submodule' '
|
|
test_config_global protocol.file.allow always &&
|
|
(
|
|
cd withsub &&
|
|
git worktree add to-remove HEAD &&
|
|
git -C to-remove submodule update &&
|
|
test_must_fail git worktree remove to-remove
|
|
)
|
|
'
|
|
|
|
test_done
|