Merge branch 'mt/add-rm-in-sparse-checkout'
"git add" and "git rm" learned not to touch those paths that are outside of sparse checkout. * mt/add-rm-in-sparse-checkout: rm: honor sparse checkout patterns add: warn when asked to update SKIP_WORKTREE entries refresh_index(): add flag to ignore SKIP_WORKTREE entries pathspec: allow to ignore SKIP_WORKTREE entries on index matching add: make --chmod and --renormalize honor sparse checkouts t3705: add tests for `git add` in sparse checkouts add: include magic part of pathspec on --refresh error
This commit is contained in:
Junio C Hamano
78
t/t3602-rm-sparse-checkout.sh
Executable file
78
t/t3602-rm-sparse-checkout.sh
Executable file
@ -0,0 +1,78 @@
|
||||
#!/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
|
||||
@ -196,6 +196,12 @@ test_expect_success 'git add --refresh with pathspec' '
|
||||
grep baz actual
|
||||
'
|
||||
|
||||
test_expect_success 'git add --refresh correctly reports no match error' "
|
||||
echo \"fatal: pathspec ':(icase)nonexistent' did not match any files\" >expect &&
|
||||
test_must_fail git add --refresh ':(icase)nonexistent' 2>actual &&
|
||||
test_cmp expect actual
|
||||
"
|
||||
|
||||
test_expect_success POSIXPERM,SANITY 'git add should fail atomically upon an unreadable file' '
|
||||
git reset --hard &&
|
||||
date >foo1 &&
|
||||
|
||||
155
t/t3705-add-sparse-checkout.sh
Executable file
155
t/t3705-add-sparse-checkout.sh
Executable file
@ -0,0 +1,155 @@
|
||||
#!/bin/sh
|
||||
|
||||
test_description='git add in sparse checked out working trees'
|
||||
|
||||
. ./test-lib.sh
|
||||
|
||||
SPARSE_ENTRY_BLOB=""
|
||||
|
||||
# Optionally take a printf format string to write to the sparse_entry file
|
||||
setup_sparse_entry () {
|
||||
# 'sparse_entry' might already be in the index with the skip-worktree
|
||||
# bit set. Remove it so that the subsequent git add can update it.
|
||||
git update-index --force-remove sparse_entry &&
|
||||
if test $# -eq 1
|
||||
then
|
||||
printf "$1" >sparse_entry
|
||||
else
|
||||
>sparse_entry
|
||||
fi &&
|
||||
git add sparse_entry &&
|
||||
git update-index --skip-worktree sparse_entry &&
|
||||
SPARSE_ENTRY_BLOB=$(git rev-parse :sparse_entry)
|
||||
}
|
||||
|
||||
test_sparse_entry_unchanged () {
|
||||
echo "100644 $SPARSE_ENTRY_BLOB 0 sparse_entry" >expected &&
|
||||
git ls-files --stage sparse_entry >actual &&
|
||||
test_cmp expected actual
|
||||
}
|
||||
|
||||
setup_gitignore () {
|
||||
test_when_finished rm -f .gitignore &&
|
||||
cat >.gitignore <<-EOF
|
||||
*
|
||||
!/sparse_entry
|
||||
EOF
|
||||
}
|
||||
|
||||
test_expect_success 'setup' "
|
||||
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 sparse_entry | cat sparse_error_header - >sparse_entry_error &&
|
||||
cat sparse_entry_error sparse_hint >error_and_hint
|
||||
"
|
||||
|
||||
test_expect_success 'git add does not remove sparse entries' '
|
||||
setup_sparse_entry &&
|
||||
rm sparse_entry &&
|
||||
test_must_fail git add sparse_entry 2>stderr &&
|
||||
test_cmp error_and_hint stderr &&
|
||||
test_sparse_entry_unchanged
|
||||
'
|
||||
|
||||
test_expect_success 'git add -A does not remove sparse entries' '
|
||||
setup_sparse_entry &&
|
||||
rm sparse_entry &&
|
||||
setup_gitignore &&
|
||||
git add -A 2>stderr &&
|
||||
test_must_be_empty stderr &&
|
||||
test_sparse_entry_unchanged
|
||||
'
|
||||
|
||||
test_expect_success 'git add . does not remove sparse entries' '
|
||||
setup_sparse_entry &&
|
||||
rm sparse_entry &&
|
||||
setup_gitignore &&
|
||||
test_must_fail git add . 2>stderr &&
|
||||
|
||||
cat sparse_error_header >expect &&
|
||||
echo . >>expect &&
|
||||
cat sparse_hint >>expect &&
|
||||
|
||||
test_cmp expect stderr &&
|
||||
test_sparse_entry_unchanged
|
||||
'
|
||||
|
||||
for opt in "" -f -u --ignore-removal --dry-run
|
||||
do
|
||||
test_expect_success "git add${opt:+ $opt} does not update sparse entries" '
|
||||
setup_sparse_entry &&
|
||||
echo modified >sparse_entry &&
|
||||
test_must_fail git add $opt sparse_entry 2>stderr &&
|
||||
test_cmp error_and_hint stderr &&
|
||||
test_sparse_entry_unchanged
|
||||
'
|
||||
done
|
||||
|
||||
test_expect_success 'git add --refresh does not update sparse entries' '
|
||||
setup_sparse_entry &&
|
||||
git ls-files --debug sparse_entry | grep mtime >before &&
|
||||
test-tool chmtime -60 sparse_entry &&
|
||||
test_must_fail git add --refresh sparse_entry 2>stderr &&
|
||||
test_cmp error_and_hint stderr &&
|
||||
git ls-files --debug sparse_entry | grep mtime >after &&
|
||||
test_cmp before after
|
||||
'
|
||||
|
||||
test_expect_success 'git add --chmod does not update sparse entries' '
|
||||
setup_sparse_entry &&
|
||||
test_must_fail git add --chmod=+x sparse_entry 2>stderr &&
|
||||
test_cmp error_and_hint stderr &&
|
||||
test_sparse_entry_unchanged &&
|
||||
! test -x sparse_entry
|
||||
'
|
||||
|
||||
test_expect_success 'git add --renormalize does not update sparse entries' '
|
||||
test_config core.autocrlf false &&
|
||||
setup_sparse_entry "LINEONE\r\nLINETWO\r\n" &&
|
||||
echo "sparse_entry text=auto" >.gitattributes &&
|
||||
test_must_fail git add --renormalize sparse_entry 2>stderr &&
|
||||
test_cmp error_and_hint stderr &&
|
||||
test_sparse_entry_unchanged
|
||||
'
|
||||
|
||||
test_expect_success 'git add --dry-run --ignore-missing warn on sparse path' '
|
||||
setup_sparse_entry &&
|
||||
rm sparse_entry &&
|
||||
test_must_fail git add --dry-run --ignore-missing sparse_entry 2>stderr &&
|
||||
test_cmp error_and_hint stderr &&
|
||||
test_sparse_entry_unchanged
|
||||
'
|
||||
|
||||
test_expect_success 'do not advice about sparse entries when they do not match the pathspec' '
|
||||
setup_sparse_entry &&
|
||||
test_must_fail git add 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 when pathspec matches dense entries' '
|
||||
setup_sparse_entry &&
|
||||
echo modified >sparse_entry &&
|
||||
>dense_entry &&
|
||||
git add "*_entry" 2>stderr &&
|
||||
test_must_be_empty stderr &&
|
||||
test_sparse_entry_unchanged &&
|
||||
git ls-files --error-unmatch dense_entry
|
||||
'
|
||||
|
||||
test_expect_success 'add obeys advice.updateSparsePath' '
|
||||
setup_sparse_entry &&
|
||||
test_must_fail git -c advice.updateSparsePath=false add sparse_entry 2>stderr &&
|
||||
test_cmp sparse_entry_error stderr
|
||||
|
||||
'
|
||||
|
||||
test_done
|
||||
@ -132,11 +132,6 @@ test_expect_success 'diff-files does not examine skip-worktree dirty entries' '
|
||||
test -z "$(git diff-files -- one)"
|
||||
'
|
||||
|
||||
test_expect_success 'git-rm succeeds on skip-worktree absent entries' '
|
||||
setup_absent &&
|
||||
git rm 1
|
||||
'
|
||||
|
||||
test_expect_success 'commit on skip-worktree absent entries' '
|
||||
git reset &&
|
||||
setup_absent &&
|
||||
|
||||
@ -60,13 +60,6 @@ setup_absent() {
|
||||
git update-index --skip-worktree 1
|
||||
}
|
||||
|
||||
test_absent() {
|
||||
echo "100644 $EMPTY_BLOB 0 1" > expected &&
|
||||
git ls-files --stage 1 > result &&
|
||||
test_cmp expected result &&
|
||||
test ! -f 1
|
||||
}
|
||||
|
||||
setup_dirty() {
|
||||
git update-index --force-remove 1 &&
|
||||
echo dirty > 1 &&
|
||||
@ -100,18 +93,6 @@ test_expect_success 'index setup' '
|
||||
test_cmp expected result
|
||||
'
|
||||
|
||||
test_expect_success 'git-add ignores worktree content' '
|
||||
setup_absent &&
|
||||
git add 1 &&
|
||||
test_absent
|
||||
'
|
||||
|
||||
test_expect_success 'git-add ignores worktree content' '
|
||||
setup_dirty &&
|
||||
git add 1 &&
|
||||
test_dirty
|
||||
'
|
||||
|
||||
test_expect_success 'git-rm fails if worktree is dirty' '
|
||||
setup_dirty &&
|
||||
test_must_fail git rm 1 &&
|
||||
|
||||
Reference in New Issue
Block a user