| Message ID | 20220619032549.156335-2-shaoxuan.yuan02@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | mv: fix out-of-cone file/directory move logic | expand |
Shaoxuan Yuan wrote: > Add corresponding tests to test following situations: > > We do not have sufficient coverage of moving files outside > of a sparse-checkout cone. Create new tests covering this > behavior, keeping in mind that the user can include --sparse > (or not), move a file or directory, and the destination can > already exist in the index (in this case user can use --force > to overwrite existing entry). > > Helped-by: Victoria Dye <vdye@github.com> > Helped-by: Derrick Stolee <derrickstolee@github.com> > Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com> > --- > t/t7002-mv-sparse-checkout.sh | 87 +++++++++++++++++++++++++++++++++++ > 1 file changed, 87 insertions(+) > > diff --git a/t/t7002-mv-sparse-checkout.sh b/t/t7002-mv-sparse-checkout.sh > index f0f7cbfcdb..d6e7315a5a 100755 > --- a/t/t7002-mv-sparse-checkout.sh > +++ b/t/t7002-mv-sparse-checkout.sh > @@ -4,6 +4,18 @@ test_description='git mv in sparse working trees' > > . ./test-lib.sh > > +setup_sparse_checkout () { > + mkdir folder1 && > + touch folder1/file1 && > + git add folder1 && > + git sparse-checkout set --cone sub > +} > + > +cleanup_sparse_checkout () { > + git sparse-checkout disable && > + git reset --hard > +} > + > test_expect_success 'setup' " > mkdir -p sub/dir sub/dir2 && > touch a b c sub/d sub/dir/e sub/dir2/e && > @@ -196,6 +208,7 @@ test_expect_success 'can move files to non-sparse dir' ' > ' > > test_expect_success 'refuse to move file to non-skip-worktree sparse path' ' > + test_when_finished "cleanup_sparse_checkout" && > git reset --hard && > git sparse-checkout init --no-cone && > git sparse-checkout set a !/x y/ !x/y/z && > @@ -206,4 +219,78 @@ test_expect_success 'refuse to move file to non-skip-worktree sparse path' ' > test_cmp expect stderr > ' > > +test_expect_failure 'refuse to move out-of-cone directory without --sparse' ' > + test_when_finished "cleanup_sparse_checkout" && > + setup_sparse_checkout && The setup and cleanup approach looks good - thanks for updating it! > + > + test_must_fail git mv folder1 sub 2>stderr && > + cat sparse_error_header >expect && > + echo folder1/file1 >>expect && > + cat sparse_hint >>expect && > + test_cmp expect stderr > +' > + > +test_expect_failure 'can move out-of-cone directory with --sparse' ' > + test_when_finished "cleanup_sparse_checkout" && > + setup_sparse_checkout && > + > + git mv --sparse folder1 sub 1>actual 2>stderr && > + test_must_be_empty stderr && > + > + git sparse-checkout reapply && You shouldn't need to run 'reapply' here (you remove it in Patch 7, but it should probably be dropped here instead). > + test_path_is_dir sub/folder1 && > + test_path_is_file sub/folder1/file1 > +' > + > +test_expect_failure 'refuse to move out-of-cone file without --sparse' ' > + test_when_finished "cleanup_sparse_checkout" && > + setup_sparse_checkout && > + > + test_must_fail git mv folder1/file1 sub 2>stderr && > + cat sparse_error_header >expect && > + echo folder1/file1 >>expect && > + cat sparse_hint >>expect && > + test_cmp expect stderr > +' > + > +test_expect_failure 'can move out-of-cone file with --sparse' ' > + test_when_finished "cleanup_sparse_checkout" && > + setup_sparse_checkout && > + > + git mv --sparse folder1/file1 sub 1>actual 2>stderr && > + test_must_be_empty stderr && > + > + git sparse-checkout reapply && > + ! test_path_is_dir sub/folder1 && > + test_path_is_file sub/file1 You can also drop the 'reapply' here (same reason as above), but you'll also probably need to drop the '! test_path_is_dir sub/folder1'. Based on some rough testing of the command in its current state, 'git mv' doesn't delete a directory if 'mv' the last remaining file in that directory. In this test, the directory being deleted is a result of 'sparse-checkout reapply', not 'mv'. > +' > + > +test_expect_failure 'refuse to move sparse file to existing destination' ' > + test_when_finished "cleanup_sparse_checkout" && > + mkdir folder1 && > + touch folder1/file1 && > + touch sub/file1 && > + git add folder1 sub/file1 && > + git sparse-checkout set --cone sub && > + > + test_must_fail git mv --sparse folder1/file1 sub 2>stderr && > + echo "fatal: destination exists, source=folder1/file1, destination=sub/file1" >expect && > + test_cmp expect stderr > +' > + > +test_expect_failure 'move sparse file to existing destination with --force and --sparse' ' > + test_when_finished "cleanup_sparse_checkout" && > + mkdir folder1 && > + touch folder1/file1 && > + touch sub/file1 && > + echo "overwrite" >folder1/file1 && > + git add folder1 sub/file1 && > + git sparse-checkout set --cone sub && > + > + git mv --sparse --force folder1/file1 sub 2>stderr && > + test_must_be_empty stderr && > + echo "overwrite" >expect && > + test_cmp expect sub/file1 > +' > + > test_done
diff --git a/t/t7002-mv-sparse-checkout.sh b/t/t7002-mv-sparse-checkout.sh index f0f7cbfcdb..d6e7315a5a 100755 --- a/t/t7002-mv-sparse-checkout.sh +++ b/t/t7002-mv-sparse-checkout.sh @@ -4,6 +4,18 @@ test_description='git mv in sparse working trees' . ./test-lib.sh +setup_sparse_checkout () { + mkdir folder1 && + touch folder1/file1 && + git add folder1 && + git sparse-checkout set --cone sub +} + +cleanup_sparse_checkout () { + git sparse-checkout disable && + git reset --hard +} + test_expect_success 'setup' " mkdir -p sub/dir sub/dir2 && touch a b c sub/d sub/dir/e sub/dir2/e && @@ -196,6 +208,7 @@ test_expect_success 'can move files to non-sparse dir' ' ' test_expect_success 'refuse to move file to non-skip-worktree sparse path' ' + test_when_finished "cleanup_sparse_checkout" && git reset --hard && git sparse-checkout init --no-cone && git sparse-checkout set a !/x y/ !x/y/z && @@ -206,4 +219,78 @@ test_expect_success 'refuse to move file to non-skip-worktree sparse path' ' test_cmp expect stderr ' +test_expect_failure 'refuse to move out-of-cone directory without --sparse' ' + test_when_finished "cleanup_sparse_checkout" && + setup_sparse_checkout && + + test_must_fail git mv folder1 sub 2>stderr && + cat sparse_error_header >expect && + echo folder1/file1 >>expect && + cat sparse_hint >>expect && + test_cmp expect stderr +' + +test_expect_failure 'can move out-of-cone directory with --sparse' ' + test_when_finished "cleanup_sparse_checkout" && + setup_sparse_checkout && + + git mv --sparse folder1 sub 1>actual 2>stderr && + test_must_be_empty stderr && + + git sparse-checkout reapply && + test_path_is_dir sub/folder1 && + test_path_is_file sub/folder1/file1 +' + +test_expect_failure 'refuse to move out-of-cone file without --sparse' ' + test_when_finished "cleanup_sparse_checkout" && + setup_sparse_checkout && + + test_must_fail git mv folder1/file1 sub 2>stderr && + cat sparse_error_header >expect && + echo folder1/file1 >>expect && + cat sparse_hint >>expect && + test_cmp expect stderr +' + +test_expect_failure 'can move out-of-cone file with --sparse' ' + test_when_finished "cleanup_sparse_checkout" && + setup_sparse_checkout && + + git mv --sparse folder1/file1 sub 1>actual 2>stderr && + test_must_be_empty stderr && + + git sparse-checkout reapply && + ! test_path_is_dir sub/folder1 && + test_path_is_file sub/file1 +' + +test_expect_failure 'refuse to move sparse file to existing destination' ' + test_when_finished "cleanup_sparse_checkout" && + mkdir folder1 && + touch folder1/file1 && + touch sub/file1 && + git add folder1 sub/file1 && + git sparse-checkout set --cone sub && + + test_must_fail git mv --sparse folder1/file1 sub 2>stderr && + echo "fatal: destination exists, source=folder1/file1, destination=sub/file1" >expect && + test_cmp expect stderr +' + +test_expect_failure 'move sparse file to existing destination with --force and --sparse' ' + test_when_finished "cleanup_sparse_checkout" && + mkdir folder1 && + touch folder1/file1 && + touch sub/file1 && + echo "overwrite" >folder1/file1 && + git add folder1 sub/file1 && + git sparse-checkout set --cone sub && + + git mv --sparse --force folder1/file1 sub 2>stderr && + test_must_be_empty stderr && + echo "overwrite" >expect && + test_cmp expect sub/file1 +' + test_done
Add corresponding tests to test following situations: We do not have sufficient coverage of moving files outside of a sparse-checkout cone. Create new tests covering this behavior, keeping in mind that the user can include --sparse (or not), move a file or directory, and the destination can already exist in the index (in this case user can use --force to overwrite existing entry). Helped-by: Victoria Dye <vdye@github.com> Helped-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com> --- t/t7002-mv-sparse-checkout.sh | 87 +++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+)