6579e788c0
The previous changes modified the behavior of 'git add', 'git rm', and 'git mv' to not adjust paths outside the sparse-checkout cone, even if they exist in the working tree and their cache entries lack the SKIP_WORKTREE bit. The intention is to warn users that they are doing something potentially dangerous. The '--sparse' option was added to each command to allow careful users the same ability they had before. To improve the discoverability of this new functionality, add a message to advice.updateSparsePath that mentions the existence of the option. The previous set of changes also modified the purpose of this message to include possibly a list of paths instead of only a list of pathspecs. Make the warning message more clear about this new behavior. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
190 lines
4.7 KiB
Bash
Executable File
190 lines
4.7 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/dir/e
|
|
sub2/dir/e
|
|
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_done
|