mirror of
https://github.com/git/git.git
synced 2024-04-27 22:35:12 +02:00
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>
109 lines
3.0 KiB
Bash
Executable File
109 lines
3.0 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git rm in sparse checked out working trees'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' "
|
|
mkdir -p sub/dir &&
|
|
touch a b c sub/d sub/dir/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
|
|
|
|
echo b | cat sparse_error_header - >sparse_entry_b_error &&
|
|
cat sparse_entry_b_error sparse_hint >b_error_and_hint
|
|
"
|
|
|
|
for opt in "" -f --dry-run
|
|
do
|
|
test_expect_success "rm${opt:+ $opt} does not remove sparse entries" '
|
|
git sparse-checkout set a &&
|
|
test_must_fail git rm $opt b 2>stderr &&
|
|
test_cmp b_error_and_hint stderr &&
|
|
git ls-files --error-unmatch b
|
|
'
|
|
done
|
|
|
|
test_expect_success 'recursive rm does not remove sparse entries' '
|
|
git reset --hard &&
|
|
git sparse-checkout set sub/dir &&
|
|
test_must_fail git rm -r sub &&
|
|
git rm --sparse -r sub &&
|
|
git status --porcelain -uno >actual &&
|
|
cat >expected <<-\EOF &&
|
|
D sub/d
|
|
D sub/dir/e
|
|
EOF
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'recursive rm --sparse removes sparse entries' '
|
|
git reset --hard &&
|
|
git sparse-checkout set "sub/dir" &&
|
|
git rm --sparse -r sub &&
|
|
git status --porcelain -uno >actual &&
|
|
cat >expected <<-\EOF &&
|
|
D sub/d
|
|
D sub/dir/e
|
|
EOF
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'rm obeys advice.updateSparsePath' '
|
|
git reset --hard &&
|
|
git sparse-checkout set a &&
|
|
test_must_fail git -c advice.updateSparsePath=false rm b 2>stderr &&
|
|
test_cmp sparse_entry_b_error stderr
|
|
'
|
|
|
|
test_expect_success 'do not advice about sparse entries when they do not match the pathspec' '
|
|
git reset --hard &&
|
|
git sparse-checkout set a &&
|
|
test_must_fail git rm nonexistent 2>stderr &&
|
|
grep "fatal: pathspec .nonexistent. did not match any files" stderr &&
|
|
! grep -F -f sparse_error_header stderr
|
|
'
|
|
|
|
test_expect_success 'do not warn about sparse entries when pathspec matches dense entries' '
|
|
git reset --hard &&
|
|
git sparse-checkout set a &&
|
|
git rm "[ba]" 2>stderr &&
|
|
test_must_be_empty stderr &&
|
|
git ls-files --error-unmatch b &&
|
|
test_must_fail git ls-files --error-unmatch a
|
|
'
|
|
|
|
test_expect_success 'do not warn about sparse entries with --ignore-unmatch' '
|
|
git reset --hard &&
|
|
git sparse-checkout set a &&
|
|
git rm --ignore-unmatch b 2>stderr &&
|
|
test_must_be_empty stderr &&
|
|
git ls-files --error-unmatch b
|
|
'
|
|
|
|
test_expect_success 'refuse to rm a non-skip-worktree path outside sparse cone' '
|
|
git reset --hard &&
|
|
git sparse-checkout set a &&
|
|
git update-index --no-skip-worktree b &&
|
|
test_must_fail git rm b 2>stderr &&
|
|
test_cmp b_error_and_hint stderr &&
|
|
git rm --sparse b 2>stderr &&
|
|
test_must_be_empty stderr &&
|
|
test_path_is_missing b
|
|
'
|
|
|
|
test_done
|