mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mt/fix-add-rm-with-sparse-index'

Browse Source 
Fix-up to a topic already merged to 'master'.

* mt/fix-add-rm-with-sparse-index:
  add, rm, mv: fix bug that prevents the update of non-sparse dirs
This commit is contained in:
Junio C Hamano
2021-10-29 15:43:16 -07:00
parent 7b3fd03e6a 20141e322c
commit 68fb83b58e
4 changed files with 96 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
t/t3602-rm-sparse-checkout.sh
View File

@ -40,14 +40,20 @@ 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 rm -r sub &&
git status --porcelain -uno >actual &&
cat >expected <<-\EOF &&
D sub/dir/e
EOF
test_cmp expected actual &&
git rm --sparse -r sub &&
git status --porcelain -uno >actual2 &&
cat >expected2 <<-\EOF &&
D sub/d
D sub/dir/e
EOF
test_cmp expected actual
test_cmp expected2 actual2
'
test_expect_success 'recursive rm --sparse removes sparse entries' '
@ -105,4 +111,29 @@ test_expect_success 'refuse to rm a non-skip-worktree path outside sparse cone'
test_path_is_missing b
'
test_expect_success 'can remove files from non-sparse dir' '
git reset --hard &&
git sparse-checkout disable &&
mkdir -p w x/y &&
test_commit w/f &&
test_commit x/y/f &&
git sparse-checkout set w !/x y/ &&
git rm w/f.t x/y/f.t 2>stderr &&
test_must_be_empty stderr
'
test_expect_success 'refuse to remove non-skip-worktree file from sparse dir' '
git reset --hard &&
git sparse-checkout disable &&
mkdir -p x/y/z &&
test_commit x/y/z/f &&
git sparse-checkout set !/x y/ !x/y/z &&
git update-index --no-skip-worktree x/y/z/f.t &&
test_must_fail git rm x/y/z/f.t 2>stderr &&
echo x/y/z/f.t | cat sparse_error_header - sparse_hint >expect &&
test_cmp expect stderr
'
test_done

17
t/t3705-add-sparse-checkout.sh
View File

@ -214,4 +214,21 @@ test_expect_success 'add allows sparse entries with --sparse' '
test_must_be_empty stderr
'
test_expect_success 'can add files from non-sparse dir' '
git sparse-checkout set w !/x y/ &&
mkdir -p w x/y &&
touch w/f x/y/f &&
git add w/f x/y/f 2>stderr &&
test_must_be_empty stderr
'
test_expect_success 'refuse to add non-skip-worktree file from sparse dir' '
git sparse-checkout set !/x y/ !x/y/z &&
mkdir -p x/y/z &&
touch x/y/z/f &&
test_must_fail git add x/y/z/f 2>stderr &&
echo x/y/z/f | cat sparse_error_header - sparse_hint >expect &&
test_cmp expect stderr
'
test_done

24
t/t7002-mv-sparse-checkout.sh
View File

@ -143,8 +143,6 @@ test_expect_success 'recursive mv refuses to move (possible) sparse' '
cat >>expect <<-\EOF &&
sub/d
sub2/d
sub/dir/e
sub2/dir/e
sub/dir2/e
sub2/dir2/e
EOF
@ -186,4 +184,26 @@ test_expect_success 'recursive mv refuses to move sparse' '
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