d5f4b8260f
`git add` refrains from adding or updating index entries that are outside the current sparse checkout, but `git rm` doesn't follow the same restriction. This is somewhat counter-intuitive and inconsistent. So make `rm` honor the sparsity rules and advise on how to remove SKIP_WORKTREE entries just like `add` does. Also add some tests for the new behavior. Suggested-by: Elijah Newren <newren@gmail.com> Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br> Signed-off-by: Junio C Hamano <gitster@pobox.com>
79 lines
2.2 KiB
Bash
Executable File
79 lines
2.2 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 pathspecs didn't match any eligible path, but they do match index
|
|
entries outside the current sparse checkout:
|
|
EOF
|
|
|
|
cat >sparse_hint <<-EOF &&
|
|
hint: Disable or modify the sparsity rules if you intend to update such entries.
|
|
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 &&
|
|
git rm -r sub &&
|
|
git status --porcelain -uno >actual &&
|
|
echo "D sub/dir/e" >expected &&
|
|
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_done
|