| Message ID | 20220331091755.385961-5-shaoxuan.yuan02@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mv: fix out-of-cone file/directory move logic | expand |
On Thu, Mar 31 2022, Shaoxuan Yuan wrote: > + echo "Please use \"git sparse-checkout reapply\" to reapply the sparsity."\ > + >expect && style: space before that \ at the end, but I think it's much better to put this on one line. This looks at a glance like it's creating an empty file, until you notice the \ instead of && at the end.. > + echo "Please use \"git sparse-checkout reapply\" to reapply the sparsity."\ > + >expect && .. so if you want to keep it wrapped we usually tab-indent the +1th line to make it clear that it's continuing the above command
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' > > Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com> > --- > t/t7002-mv-sparse-checkout.sh | 72 +++++++++++++++++++++++++++++++++++ > 1 file changed, 72 insertions(+) > > diff --git a/t/t7002-mv-sparse-checkout.sh b/t/t7002-mv-sparse-checkout.sh > index 1d3d2aca21..efb260d015 100755 > --- a/t/t7002-mv-sparse-checkout.sh > +++ b/t/t7002-mv-sparse-checkout.sh > @@ -206,4 +206,76 @@ test_expect_success 'refuse to move file to non-skip-worktree sparse path' ' > test_cmp expect stderr > ' > > +test_expect_success '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_success '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 && > + echo "Please use \"git sparse-checkout reapply\" to reapply the sparsity."\ > + >expect && > + test_cmp actual expect && > + > + git sparse-checkout reapply && > + test_path_is_dir sub/folder1 && > + test_path_is_file sub/folder1/file1 > +' > + > +test_expect_success '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_success '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 && > + echo "Please use \"git sparse-checkout reapply\" to reapply the sparsity."\ > + >expect && > + test_cmp actual expect && > + > + git sparse-checkout reapply && > + ! test_path_is_dir sub/folder1 && > + test_path_is_file sub/file1 > +' > + > test_done Other than my earlier comments about moving the tests to another point in the series, the content of the tests looks great!
diff --git a/t/t7002-mv-sparse-checkout.sh b/t/t7002-mv-sparse-checkout.sh index 1d3d2aca21..efb260d015 100755 --- a/t/t7002-mv-sparse-checkout.sh +++ b/t/t7002-mv-sparse-checkout.sh @@ -206,4 +206,76 @@ test_expect_success 'refuse to move file to non-skip-worktree sparse path' ' test_cmp expect stderr ' +test_expect_success '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_success '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 && + echo "Please use \"git sparse-checkout reapply\" to reapply the sparsity."\ + >expect && + test_cmp actual expect && + + git sparse-checkout reapply && + test_path_is_dir sub/folder1 && + test_path_is_file sub/folder1/file1 +' + +test_expect_success '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_success '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 && + echo "Please use \"git sparse-checkout reapply\" to reapply the sparsity."\ + >expect && + test_cmp actual expect && + + git sparse-checkout reapply && + ! test_path_is_dir sub/folder1 && + test_path_is_file 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' Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com> --- t/t7002-mv-sparse-checkout.sh | 72 +++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+)