mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
![Matheus Tavares](/assets/img/avatar_default.png)
These three commands recently learned to avoid updating paths outside the sparse checkout even if they are missing the SKIP_WORKTREE bit. This is done using path_in_sparse_checkout(), which checks whether a given path matches the current list of sparsity rules, similar to what clear_ce_flags() does when we run "git sparse checkout init" or "git sparse-checkout reapply". However, clear_ce_flags() uses a recursive approach, applying the match results from parent directories on paths that get the UNDECIDED result, whereas path_in_sparse_checkout() only attempts to match the full path and immediately considers UNDECIDED as NOT_MATCHED. This makes the function miss matches with leading directories. For example, if the user has the sparsity patterns "!/a" and "b/", add, rm, and mv will fail to update the path "a/b/c" and end up displaying a warning about it being outside the sparse checkout even though it isn't. This problem only occurs in full pattern mode as the pattern matching functions never return UNDECIDED for cone mode. To fix this, replicate the recursive behavior of clear_ce_flags() in path_in_sparse_checkout(), falling back to the parent directory match when a path gets the UNDECIDED result. (If this turns out to be too expensive in some cases, we may want to later add some form of caching to accelerate multiple queries within the same directory. This is not implemented in this patch, though.) Also add two tests for each affected command (add, rm, and mv) to check that they behave correctly with the recursive pattern matching. The first test would previously fail without this patch while the second already succeeded. It is added mostly to make sure that we are not breaking the existing pattern matching for directories that are really sparse, and also as a protection against any future regressions. Two other existing tests had to be changed as well: one test in t3602 checks that "git rm -r <dir>" won't remove sparse entries, but it didn't allow the non-sparse entries inside <dir> to be removed. The other one, in t7002, tested that "git mv" would correctly display a warning message for sparse paths, but it accidentally expected the message to include two non-sparse paths as well. Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br> Acked-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
210 lines
5.3 KiB
Bash
Executable file
210 lines
5.3 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git mv in sparse working trees'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' "
|
|
mkdir -p sub/dir sub/dir2 &&
|
|
touch a b c sub/d sub/dir/e sub/dir2/e &&
|
|
git add -A &&
|
|
git commit -m files &&
|
|
|
|
cat >sparse_error_header <<-EOF &&
|
|
The following paths and/or pathspecs matched paths that exist
|
|
outside of your sparse-checkout definition, so will not be
|
|
updated in the index:
|
|
EOF
|
|
|
|
cat >sparse_hint <<-EOF
|
|
hint: If you intend to update such entries, try one of the following:
|
|
hint: * Use the --sparse option.
|
|
hint: * Disable or modify the sparsity rules.
|
|
hint: Disable this message with \"git config advice.updateSparsePath false\"
|
|
EOF
|
|
"
|
|
|
|
test_expect_success 'mv refuses to move sparse-to-sparse' '
|
|
test_when_finished rm -f e &&
|
|
git reset --hard &&
|
|
git sparse-checkout set a &&
|
|
touch b &&
|
|
test_must_fail git mv b e 2>stderr &&
|
|
cat sparse_error_header >expect &&
|
|
echo b >>expect &&
|
|
echo e >>expect &&
|
|
cat sparse_hint >>expect &&
|
|
test_cmp expect stderr &&
|
|
git mv --sparse b e 2>stderr &&
|
|
test_must_be_empty stderr
|
|
'
|
|
|
|
test_expect_success 'mv refuses to move sparse-to-sparse, ignores failure' '
|
|
test_when_finished rm -f b c e &&
|
|
git reset --hard &&
|
|
git sparse-checkout set a &&
|
|
|
|
# tracked-to-untracked
|
|
touch b &&
|
|
git mv -k b e 2>stderr &&
|
|
test_path_exists b &&
|
|
test_path_is_missing e &&
|
|
cat sparse_error_header >expect &&
|
|
echo b >>expect &&
|
|
echo e >>expect &&
|
|
cat sparse_hint >>expect &&
|
|
test_cmp expect stderr &&
|
|
|
|
git mv --sparse b e 2>stderr &&
|
|
test_must_be_empty stderr &&
|
|
test_path_is_missing b &&
|
|
test_path_exists e &&
|
|
|
|
# tracked-to-tracked
|
|
git reset --hard &&
|
|
touch b &&
|
|
git mv -k b c 2>stderr &&
|
|
test_path_exists b &&
|
|
test_path_is_missing c &&
|
|
cat sparse_error_header >expect &&
|
|
echo b >>expect &&
|
|
echo c >>expect &&
|
|
cat sparse_hint >>expect &&
|
|
test_cmp expect stderr &&
|
|
|
|
git mv --sparse b c 2>stderr &&
|
|
test_must_be_empty stderr &&
|
|
test_path_is_missing b &&
|
|
test_path_exists c
|
|
'
|
|
|
|
test_expect_success 'mv refuses to move non-sparse-to-sparse' '
|
|
test_when_finished rm -f b c e &&
|
|
git reset --hard &&
|
|
git sparse-checkout set a &&
|
|
|
|
# tracked-to-untracked
|
|
test_must_fail git mv a e 2>stderr &&
|
|
test_path_exists a &&
|
|
test_path_is_missing e &&
|
|
cat sparse_error_header >expect &&
|
|
echo e >>expect &&
|
|
cat sparse_hint >>expect &&
|
|
test_cmp expect stderr &&
|
|
git mv --sparse a e 2>stderr &&
|
|
test_must_be_empty stderr &&
|
|
test_path_is_missing a &&
|
|
test_path_exists e &&
|
|
|
|
# tracked-to-tracked
|
|
rm e &&
|
|
git reset --hard &&
|
|
test_must_fail git mv a c 2>stderr &&
|
|
test_path_exists a &&
|
|
test_path_is_missing c &&
|
|
cat sparse_error_header >expect &&
|
|
echo c >>expect &&
|
|
cat sparse_hint >>expect &&
|
|
test_cmp expect stderr &&
|
|
git mv --sparse a c 2>stderr &&
|
|
test_must_be_empty stderr &&
|
|
test_path_is_missing a &&
|
|
test_path_exists c
|
|
'
|
|
|
|
test_expect_success 'mv refuses to move sparse-to-non-sparse' '
|
|
test_when_finished rm -f b c e &&
|
|
git reset --hard &&
|
|
git sparse-checkout set a e &&
|
|
|
|
# tracked-to-untracked
|
|
touch b &&
|
|
test_must_fail git mv b e 2>stderr &&
|
|
cat sparse_error_header >expect &&
|
|
echo b >>expect &&
|
|
cat sparse_hint >>expect &&
|
|
test_cmp expect stderr &&
|
|
git mv --sparse b e 2>stderr &&
|
|
test_must_be_empty stderr
|
|
'
|
|
|
|
test_expect_success 'recursive mv refuses to move (possible) sparse' '
|
|
test_when_finished rm -rf b c e sub2 &&
|
|
git reset --hard &&
|
|
# Without cone mode, "sub" and "sub2" do not match
|
|
git sparse-checkout set sub/dir sub2/dir &&
|
|
|
|
# Add contained contents to ensure we avoid non-existence errors
|
|
mkdir sub/dir2 &&
|
|
touch sub/d sub/dir2/e &&
|
|
|
|
test_must_fail git mv sub sub2 2>stderr &&
|
|
cat sparse_error_header >expect &&
|
|
cat >>expect <<-\EOF &&
|
|
sub/d
|
|
sub2/d
|
|
sub/dir2/e
|
|
sub2/dir2/e
|
|
EOF
|
|
cat sparse_hint >>expect &&
|
|
test_cmp expect stderr &&
|
|
git mv --sparse sub sub2 2>stderr &&
|
|
test_must_be_empty stderr &&
|
|
git commit -m "moved sub to sub2" &&
|
|
git rev-parse HEAD~1:sub >expect &&
|
|
git rev-parse HEAD:sub2 >actual &&
|
|
test_cmp expect actual &&
|
|
git reset --hard HEAD~1
|
|
'
|
|
|
|
test_expect_success 'recursive mv refuses to move sparse' '
|
|
git reset --hard &&
|
|
# Use cone mode so "sub/" matches the sparse-checkout patterns
|
|
git sparse-checkout init --cone &&
|
|
git sparse-checkout set sub/dir sub2/dir &&
|
|
|
|
# Add contained contents to ensure we avoid non-existence errors
|
|
mkdir sub/dir2 &&
|
|
touch sub/dir2/e &&
|
|
|
|
test_must_fail git mv sub sub2 2>stderr &&
|
|
cat sparse_error_header >expect &&
|
|
cat >>expect <<-\EOF &&
|
|
sub/dir2/e
|
|
sub2/dir2/e
|
|
EOF
|
|
cat sparse_hint >>expect &&
|
|
test_cmp expect stderr &&
|
|
git mv --sparse sub sub2 2>stderr &&
|
|
test_must_be_empty stderr &&
|
|
git commit -m "moved sub to sub2" &&
|
|
git rev-parse HEAD~1:sub >expect &&
|
|
git rev-parse HEAD:sub2 >actual &&
|
|
test_cmp expect actual &&
|
|
git reset --hard HEAD~1
|
|
'
|
|
|
|
test_expect_success 'can move files to non-sparse dir' '
|
|
git reset --hard &&
|
|
git sparse-checkout init --no-cone &&
|
|
git sparse-checkout set a b c w !/x y/ &&
|
|
mkdir -p w x/y &&
|
|
|
|
git mv a w/new-a 2>stderr &&
|
|
git mv b x/y/new-b 2>stderr &&
|
|
test_must_be_empty stderr
|
|
'
|
|
|
|
test_expect_success 'refuse to move file to non-skip-worktree sparse path' '
|
|
git reset --hard &&
|
|
git sparse-checkout init --no-cone &&
|
|
git sparse-checkout set a !/x y/ !x/y/z &&
|
|
mkdir -p x/y/z &&
|
|
|
|
test_must_fail git mv a x/y/z/new-a 2>stderr &&
|
|
echo x/y/z/new-a | cat sparse_error_header - sparse_hint >expect &&
|
|
test_cmp expect stderr
|
|
'
|
|
|
|
test_done
|