| Message ID | 20220527100804.209890-2-shaoxuan.yuan02@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | mv: fix out-of-cone file/directory move logic | expand |
On Fri, May 27 2022, Shaoxuan Yuan wrote: > +test_expect_failure 'refuse to move out-of-cone directory without --sparse' ' > + git sparse-checkout disable && > + git reset --hard && > + mkdir folder1 && > + touch folder1/file1 && We don't usually use "touch file", don't you mean just ">file" here and below? > + git add folder1 && > + git sparse-checkout init --cone && > + git sparse-checkout set sub && > + > + 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' ' > + git sparse-checkout disable && > + git reset --hard && > + mkdir folder1 && > + touch folder1/file1 && > + git add folder1 && > + git sparse-checkout init --cone && > + git sparse-checkout set sub && > + > + git mv --sparse folder1 sub 1>actual 2>stderr && use e.g. "out" and "err" instead of "actual" and "stderr". I.e. when we test both we use something like that usually.
On 5/27/2022 6:08 AM, Shaoxuan Yuan wrote: > Add corresponding tests to test following situations: > > * 'refuse to move out-of-cone directory without --sparse' > * 'can move out-of-cone directory with --sparse' > * 'refuse to move out-of-cone file without --sparse' > * 'can move out-of-cone file with --sparse' > * 'refuse to move sparse file to existing destination' > * 'move sparse file to existing destination with --force and --sparse' Style nit: bulleted lists like this don't add too much value on top of reading the patch. You can use prose to describe how you decided that these tests are the ones to write. Something like: 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. Thanks, -Stolee
Shaoxuan Yuan wrote: > Add corresponding tests to test following situations: > > * 'refuse to move out-of-cone directory without --sparse' > * 'can move out-of-cone directory with --sparse' > * 'refuse to move out-of-cone file without --sparse' > * 'can move out-of-cone file with --sparse' > * 'refuse to move sparse file to existing destination' > * 'move sparse file to existing destination with --force and --sparse' > > Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com> > --- > t/t7002-mv-sparse-checkout.sh | 98 +++++++++++++++++++++++++++++++++++ > 1 file changed, 98 insertions(+) > > diff --git a/t/t7002-mv-sparse-checkout.sh b/t/t7002-mv-sparse-checkout.sh > index 1d3d2aca21..963cb512e2 100755 > --- a/t/t7002-mv-sparse-checkout.sh > +++ b/t/t7002-mv-sparse-checkout.sh > @@ -206,4 +206,102 @@ test_expect_success 'refuse to move file to non-skip-worktree sparse path' ' > test_cmp expect stderr > ' > Apologies in advance for adding more comments (after I said the last version looked good)! I'm always learning things about Git, so hopefully my suggestions are at least better than in my last review. :) > +test_expect_failure 'refuse to move out-of-cone directory without --sparse' ' > + git sparse-checkout disable && > + git reset --hard && > + mkdir folder1 && > + touch folder1/file1 && > + git add folder1 && > + git sparse-checkout init --cone && Note that 'init' is now deprecated [1] (I think that happened between your v1 and now, FWIW). You can use 'git sparse-checkout set --cone sub', to do the same thing as this + the subsequent line. [1] https://lore.kernel.org/git/9d96da855ea70e7e8a54bb68e710cc60a2f50376.1639454952.git.gitgitgadget@gmail.com/ > + git sparse-checkout set sub && > + While the tests don't automatically "reset" between them (and therefore, you don't need to disable & re-enable sparse-checkout), I like that you're explicitly clearing & re-establishing the sparse-checkout state! It makes selectively running tests *much* easier and generally avoids hand-to-see side effects from prior tests. As for test content, this particular setup block is (almost) identically repeated in all of the tests. You could pull that into functions to reduce duplication, e.g.: setup_sparse_checkout () { mkdir folder1 && touch folder1 && git add folder1 && git sparse-checkout set --cone sub } cleanup_sparse_checkout () { git sparse-checkout disable && git reset --hard } You may want to consider using "test_when_finished <some cleanup function>" to clean up each one *at the end* of the test, rather than the beginning of the next one. E.g.: test_expect_failure 'refuse to move out-of-cone directory without --sparse' ' test_when_finished "cleanup_sparse_checkout" && setup_sparse_checkout && # ...the rest of the test ' > + 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' ' > + git sparse-checkout disable && > + git reset --hard && > + mkdir folder1 && > + touch folder1/file1 && > + git add folder1 && > + git sparse-checkout init --cone && > + git sparse-checkout set sub && > + > + 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' ' > + git sparse-checkout disable && > + git reset --hard && > + mkdir folder1 && > + touch folder1/file1 && > + git add folder1 && > + git sparse-checkout init --cone && > + git sparse-checkout set sub && > + > + 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' ' > + git sparse-checkout disable && > + git reset --hard && > + mkdir folder1 && > + touch folder1/file1 && > + git add folder1 && > + git sparse-checkout init --cone && > + git sparse-checkout set sub && > + > + 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' ' > + git sparse-checkout disable && > + git reset --hard && > + mkdir folder1 && > + touch folder1/file1 && > + touch sub/file1 && > + git add folder1 sub/file1 && > + git sparse-checkout init --cone && > + git sparse-checkout set 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' ' > + git sparse-checkout disable && > + git reset --hard && > + mkdir folder1 && > + touch folder1/file1 && > + touch sub/file1 && > + echo "overwrite" >folder1/file1 && > + git add folder1 sub/file1 && > + git sparse-checkout init --cone && > + git sparse-checkout set 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 These tests clearly establish the behavior you want to implement for 'git mv'. As in V1, nice work!
diff --git a/t/t7002-mv-sparse-checkout.sh b/t/t7002-mv-sparse-checkout.sh index 1d3d2aca21..963cb512e2 100755 --- a/t/t7002-mv-sparse-checkout.sh +++ b/t/t7002-mv-sparse-checkout.sh @@ -206,4 +206,102 @@ 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' ' + git sparse-checkout disable && + git reset --hard && + mkdir folder1 && + touch folder1/file1 && + git add folder1 && + git sparse-checkout init --cone && + git sparse-checkout set sub && + + 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' ' + git sparse-checkout disable && + git reset --hard && + mkdir folder1 && + touch folder1/file1 && + git add folder1 && + git sparse-checkout init --cone && + git sparse-checkout set sub && + + 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' ' + git sparse-checkout disable && + git reset --hard && + mkdir folder1 && + touch folder1/file1 && + git add folder1 && + git sparse-checkout init --cone && + git sparse-checkout set sub && + + 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' ' + git sparse-checkout disable && + git reset --hard && + mkdir folder1 && + touch folder1/file1 && + git add folder1 && + git sparse-checkout init --cone && + git sparse-checkout set sub && + + 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' ' + git sparse-checkout disable && + git reset --hard && + mkdir folder1 && + touch folder1/file1 && + touch sub/file1 && + git add folder1 sub/file1 && + git sparse-checkout init --cone && + git sparse-checkout set 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' ' + git sparse-checkout disable && + git reset --hard && + mkdir folder1 && + touch folder1/file1 && + touch sub/file1 && + echo "overwrite" >folder1/file1 && + git add folder1 sub/file1 && + git sparse-checkout init --cone && + git sparse-checkout set 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: * 'refuse to move out-of-cone directory without --sparse' * 'can move out-of-cone directory with --sparse' * 'refuse to move out-of-cone file without --sparse' * 'can move out-of-cone file with --sparse' * 'refuse to move sparse file to existing destination' * 'move sparse file to existing destination with --force and --sparse' Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com> --- t/t7002-mv-sparse-checkout.sh | 98 +++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+)