git/t/t7002-mv-sparse-checkout.sh

518 lines
14 KiB
Bash
Raw Normal View History

#!/bin/sh
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 &&
git add -A &&
git commit -m files &&
cat >sparse_error_header <<-EOF &&
The following paths and/or pathspecs matched paths that exist
outside of your sparse-checkout definition, so will not be
updated in the index:
EOF
cat >sparse_hint <<-EOF &&
hint: If you intend to update such entries, try one of the following:
hint: * Use the --sparse option.
hint: * Disable or modify the sparsity rules.
hint: Disable this message with \"git config advice.updateSparsePath false\"
EOF
cat >dirty_error_header <<-EOF &&
The following paths have been moved outside the
sparse-checkout definition but are not sparse due to local
modifications.
EOF
cat >dirty_hint <<-EOF
hint: To correct the sparsity of these paths, do the following:
hint: * Use \"git add --sparse <paths>\" to update the index
hint: * Use \"git sparse-checkout reapply\" to apply the sparsity rules
hint: Disable this message with \"git config advice.updateSparsePath false\"
EOF
"
test_expect_success 'mv refuses to move sparse-to-sparse' '
test_when_finished rm -f e &&
git reset --hard &&
git sparse-checkout set --no-cone a &&
touch b &&
test_must_fail git mv b e 2>stderr &&
cat sparse_error_header >expect &&
echo b >>expect &&
echo e >>expect &&
cat sparse_hint >>expect &&
test_cmp expect stderr &&
git mv --sparse b e 2>stderr &&
test_must_be_empty stderr
'
test_expect_success 'mv refuses to move sparse-to-sparse, ignores failure' '
test_when_finished rm -f b c e &&
git reset --hard &&
git sparse-checkout set a &&
# tracked-to-untracked
touch b &&
git mv -k b e 2>stderr &&
test_path_exists b &&
test_path_is_missing e &&
cat sparse_error_header >expect &&
echo b >>expect &&
echo e >>expect &&
cat sparse_hint >>expect &&
test_cmp expect stderr &&
git mv --sparse b e 2>stderr &&
test_must_be_empty stderr &&
test_path_is_missing b &&
test_path_exists e &&
# tracked-to-tracked
git reset --hard &&
touch b &&
git mv -k b c 2>stderr &&
test_path_exists b &&
test_path_is_missing c &&
cat sparse_error_header >expect &&
echo b >>expect &&
echo c >>expect &&
cat sparse_hint >>expect &&
test_cmp expect stderr &&
git mv --sparse b c 2>stderr &&
test_must_be_empty stderr &&
test_path_is_missing b &&
test_path_exists c
'
test_expect_success 'mv refuses to move non-sparse-to-sparse' '
test_when_finished rm -f b c e &&
git reset --hard &&
git sparse-checkout set a &&
# tracked-to-untracked
test_must_fail git mv a e 2>stderr &&
test_path_exists a &&
test_path_is_missing e &&
cat sparse_error_header >expect &&
echo e >>expect &&
cat sparse_hint >>expect &&
test_cmp expect stderr &&
git mv --sparse a e 2>stderr &&
test_must_be_empty stderr &&
test_path_is_missing a &&
test_path_exists e &&
# tracked-to-tracked
rm e &&
git reset --hard &&
test_must_fail git mv a c 2>stderr &&
test_path_exists a &&
test_path_is_missing c &&
cat sparse_error_header >expect &&
echo c >>expect &&
cat sparse_hint >>expect &&
test_cmp expect stderr &&
git mv --sparse a c 2>stderr &&
test_must_be_empty stderr &&
test_path_is_missing a &&
test_path_exists c
'
test_expect_success 'mv refuses to move sparse-to-non-sparse' '
test_when_finished rm -f b c e &&
git reset --hard &&
git sparse-checkout set a e &&
# tracked-to-untracked
touch b &&
test_must_fail git mv b e 2>stderr &&
cat sparse_error_header >expect &&
echo b >>expect &&
cat sparse_hint >>expect &&
test_cmp expect stderr &&
git mv --sparse b e 2>stderr &&
test_must_be_empty stderr
'
test_expect_success 'recursive mv refuses to move (possible) sparse' '
test_when_finished rm -rf b c e sub2 &&
git reset --hard &&
# Without cone mode, "sub" and "sub2" do not match
git sparse-checkout set sub/dir sub2/dir &&
# Add contained contents to ensure we avoid non-existence errors
mkdir sub/dir2 &&
touch sub/d sub/dir2/e &&
test_must_fail git mv sub sub2 2>stderr &&
cat sparse_error_header >expect &&
cat >>expect <<-\EOF &&
sub/d
sub2/d
sub/dir2/e
sub2/dir2/e
EOF
cat sparse_hint >>expect &&
test_cmp expect stderr &&
git mv --sparse sub sub2 2>stderr &&
test_must_be_empty stderr &&
git commit -m "moved sub to sub2" &&
git rev-parse HEAD~1:sub >expect &&
git rev-parse HEAD:sub2 >actual &&
test_cmp expect actual &&
git reset --hard HEAD~1
'
test_expect_success 'recursive mv refuses to move sparse' '
git reset --hard &&
# Use cone mode so "sub/" matches the sparse-checkout patterns
git sparse-checkout init --cone &&
git sparse-checkout set sub/dir sub2/dir &&
# Add contained contents to ensure we avoid non-existence errors
mkdir sub/dir2 &&
touch sub/dir2/e &&
test_must_fail git mv sub sub2 2>stderr &&
cat sparse_error_header >expect &&
cat >>expect <<-\EOF &&
sub/dir2/e
sub2/dir2/e
EOF
cat sparse_hint >>expect &&
test_cmp expect stderr &&
git mv --sparse sub sub2 2>stderr &&
test_must_be_empty stderr &&
git commit -m "moved sub to sub2" &&
git rev-parse HEAD~1:sub >expect &&
git rev-parse HEAD:sub2 >actual &&
test_cmp expect actual &&
git reset --hard HEAD~1
'
add, rm, mv: fix bug that prevents the update of non-sparse dirs These three commands recently learned to avoid updating paths outside the sparse checkout even if they are missing the SKIP_WORKTREE bit. This is done using path_in_sparse_checkout(), which checks whether a given path matches the current list of sparsity rules, similar to what clear_ce_flags() does when we run "git sparse checkout init" or "git sparse-checkout reapply". However, clear_ce_flags() uses a recursive approach, applying the match results from parent directories on paths that get the UNDECIDED result, whereas path_in_sparse_checkout() only attempts to match the full path and immediately considers UNDECIDED as NOT_MATCHED. This makes the function miss matches with leading directories. For example, if the user has the sparsity patterns "!/a" and "b/", add, rm, and mv will fail to update the path "a/b/c" and end up displaying a warning about it being outside the sparse checkout even though it isn't. This problem only occurs in full pattern mode as the pattern matching functions never return UNDECIDED for cone mode. To fix this, replicate the recursive behavior of clear_ce_flags() in path_in_sparse_checkout(), falling back to the parent directory match when a path gets the UNDECIDED result. (If this turns out to be too expensive in some cases, we may want to later add some form of caching to accelerate multiple queries within the same directory. This is not implemented in this patch, though.) Also add two tests for each affected command (add, rm, and mv) to check that they behave correctly with the recursive pattern matching. The first test would previously fail without this patch while the second already succeeded. It is added mostly to make sure that we are not breaking the existing pattern matching for directories that are really sparse, and also as a protection against any future regressions. Two other existing tests had to be changed as well: one test in t3602 checks that "git rm -r <dir>" won't remove sparse entries, but it didn't allow the non-sparse entries inside <dir> to be removed. The other one, in t7002, tested that "git mv" would correctly display a warning message for sparse paths, but it accidentally expected the message to include two non-sparse paths as well. Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br> Acked-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-10-28 14:21:11 +00:00
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' '
test_when_finished "cleanup_sparse_checkout" &&
add, rm, mv: fix bug that prevents the update of non-sparse dirs These three commands recently learned to avoid updating paths outside the sparse checkout even if they are missing the SKIP_WORKTREE bit. This is done using path_in_sparse_checkout(), which checks whether a given path matches the current list of sparsity rules, similar to what clear_ce_flags() does when we run "git sparse checkout init" or "git sparse-checkout reapply". However, clear_ce_flags() uses a recursive approach, applying the match results from parent directories on paths that get the UNDECIDED result, whereas path_in_sparse_checkout() only attempts to match the full path and immediately considers UNDECIDED as NOT_MATCHED. This makes the function miss matches with leading directories. For example, if the user has the sparsity patterns "!/a" and "b/", add, rm, and mv will fail to update the path "a/b/c" and end up displaying a warning about it being outside the sparse checkout even though it isn't. This problem only occurs in full pattern mode as the pattern matching functions never return UNDECIDED for cone mode. To fix this, replicate the recursive behavior of clear_ce_flags() in path_in_sparse_checkout(), falling back to the parent directory match when a path gets the UNDECIDED result. (If this turns out to be too expensive in some cases, we may want to later add some form of caching to accelerate multiple queries within the same directory. This is not implemented in this patch, though.) Also add two tests for each affected command (add, rm, and mv) to check that they behave correctly with the recursive pattern matching. The first test would previously fail without this patch while the second already succeeded. It is added mostly to make sure that we are not breaking the existing pattern matching for directories that are really sparse, and also as a protection against any future regressions. Two other existing tests had to be changed as well: one test in t3602 checks that "git rm -r <dir>" won't remove sparse entries, but it didn't allow the non-sparse entries inside <dir> to be removed. The other one, in t7002, tested that "git mv" would correctly display a warning message for sparse paths, but it accidentally expected the message to include two non-sparse paths as well. Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br> Acked-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-10-28 14:21:11 +00:00
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_expect_success '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_success 'can move out-of-cone directory with --sparse' '
test_when_finished "cleanup_sparse_checkout" &&
setup_sparse_checkout &&
git mv --sparse folder1 sub 2>stderr &&
test_must_be_empty stderr &&
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' '
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_success 'can move out-of-cone file with --sparse' '
test_when_finished "cleanup_sparse_checkout" &&
setup_sparse_checkout &&
git mv --sparse folder1/file1 sub 2>stderr &&
test_must_be_empty stderr &&
test_path_is_file sub/file1
'
test_expect_success '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_success '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
'
mv: from in-cone to out-of-cone Originally, moving an in-cone <source> to an out-of-cone <destination> was not possible, mainly because such <destination> is a directory that is not present in the working tree. Change the behavior so that we can move an in-cone <source> to out-of-cone <destination> when --sparse is supplied. Notice that <destination> can also be an out-of-cone file path, rather than a directory. Such <source> can be either clean or dirty, and moving it results in different behaviors: A clean move should move <source> to <destination> in the index (do *not* create <destination> in the worktree), then delete <source> from the worktree. A dirty move should move the <source> to the <destination>, both in the working tree and the index, but should *not* remove the resulted path from the working tree and should *not* turn on its CE_SKIP_WORKTREE bit. Optional reading ================ We are strict about cone mode when <destination> is a file path. The reason is that some of the previous tests that use no-cone mode in t7002 are keep breaking, mainly because the `dst_mode = SPARSE;` line added in this patch. Most features developed in both "from-out-to-in" and "from-in-to-out" only care about cone mode situation, as no-cone mode is becoming irrelevant. And because assigning `SPARSE` to `dst_mode` when the repo is in no-cone mode causes miscellaneous bugs, we should just leave this new functionality to be exclusive cone mode and save some time. Helped-by: Derrick Stolee <derrickstolee@github.com> Helped-by: Victoria Dye <vdye@github.com> Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-08-09 12:09:07 +00:00
test_expect_success 'move clean path from in-cone to out-of-cone' '
test_when_finished "cleanup_sparse_checkout" &&
setup_sparse_checkout &&
test_must_fail git mv sub/d folder1 2>stderr &&
cat sparse_error_header >expect &&
echo "folder1/d" >>expect &&
cat sparse_hint >>expect &&
test_cmp expect stderr &&
git mv --sparse sub/d folder1 2>stderr &&
test_must_be_empty stderr &&
test_path_is_missing sub/d &&
test_path_is_missing folder1/d &&
git ls-files -t >actual &&
! grep "^H sub/d\$" actual &&
grep "S folder1/d" actual
'
test_expect_success 'move clean path from in-cone to out-of-cone overwrite' '
test_when_finished "cleanup_sparse_checkout" &&
setup_sparse_checkout &&
echo "sub/file1 overwrite" >sub/file1 &&
git add sub/file1 &&
test_must_fail git mv sub/file1 folder1 2>stderr &&
cat sparse_error_header >expect &&
echo "folder1/file1" >>expect &&
cat sparse_hint >>expect &&
test_cmp expect stderr &&
test_must_fail git mv --sparse sub/file1 folder1 2>stderr &&
echo "fatal: destination exists in the index, source=sub/file1, destination=folder1/file1" \
>expect &&
test_cmp expect stderr &&
git mv --sparse -f sub/file1 folder1 2>stderr &&
test_must_be_empty stderr &&
test_path_is_missing sub/file1 &&
test_path_is_missing folder1/file1 &&
git ls-files -t >actual &&
! grep "H sub/file1" actual &&
grep "S folder1/file1" actual &&
# compare file content before move and after move
echo "sub/file1 overwrite" >expect &&
git ls-files -s -- folder1/file1 | awk "{print \$2}" >oid &&
git cat-file blob $(cat oid) >actual &&
test_cmp expect actual
'
# This test is testing the same behavior as the
# "move clean path from in-cone to out-of-cone overwrite" above.
# The only difference is the <destination> changes from "folder1" to "folder1/file1"
test_expect_success 'move clean path from in-cone to out-of-cone file overwrite' '
test_when_finished "cleanup_sparse_checkout" &&
setup_sparse_checkout &&
echo "sub/file1 overwrite" >sub/file1 &&
git add sub/file1 &&
test_must_fail git mv sub/file1 folder1/file1 2>stderr &&
cat sparse_error_header >expect &&
echo "folder1/file1" >>expect &&
cat sparse_hint >>expect &&
test_cmp expect stderr &&
test_must_fail git mv --sparse sub/file1 folder1/file1 2>stderr &&
echo "fatal: destination exists in the index, source=sub/file1, destination=folder1/file1" \
>expect &&
test_cmp expect stderr &&
git mv --sparse -f sub/file1 folder1/file1 2>stderr &&
test_must_be_empty stderr &&
test_path_is_missing sub/file1 &&
test_path_is_missing folder1/file1 &&
git ls-files -t >actual &&
! grep "H sub/file1" actual &&
grep "S folder1/file1" actual &&
# compare file content before move and after move
echo "sub/file1 overwrite" >expect &&
git ls-files -s -- folder1/file1 | awk "{print \$2}" >oid &&
git cat-file blob $(cat oid) >actual &&
test_cmp expect actual
'
test_expect_success 'move directory with one of the files overwrite' '
test_when_finished "cleanup_sparse_checkout" &&
mkdir -p folder1/dir &&
touch folder1/dir/file1 &&
git add folder1 &&
git sparse-checkout set --cone sub &&
echo test >sub/dir/file1 &&
git add sub/dir/file1 &&
test_must_fail git mv sub/dir folder1 2>stderr &&
cat sparse_error_header >expect &&
echo "folder1/dir/e" >>expect &&
echo "folder1/dir/file1" >>expect &&
cat sparse_hint >>expect &&
test_cmp expect stderr &&
test_must_fail git mv --sparse sub/dir folder1 2>stderr &&
echo "fatal: destination exists in the index, source=sub/dir/file1, destination=folder1/dir/file1" \
>expect &&
test_cmp expect stderr &&
git mv --sparse -f sub/dir folder1 2>stderr &&
test_must_be_empty stderr &&
test_path_is_missing sub/dir/file1 &&
test_path_is_missing sub/dir/e &&
test_path_is_missing folder1/file1 &&
git ls-files -t >actual &&
! grep "H sub/dir/file1" actual &&
! grep "H sub/dir/e" actual &&
grep "S folder1/dir/file1" actual &&
# compare file content before move and after move
echo test >expect &&
git ls-files -s -- folder1/dir/file1 | awk "{print \$2}" >oid &&
git cat-file blob $(cat oid) >actual &&
test_cmp expect actual
'
mv: from in-cone to out-of-cone Originally, moving an in-cone <source> to an out-of-cone <destination> was not possible, mainly because such <destination> is a directory that is not present in the working tree. Change the behavior so that we can move an in-cone <source> to out-of-cone <destination> when --sparse is supplied. Notice that <destination> can also be an out-of-cone file path, rather than a directory. Such <source> can be either clean or dirty, and moving it results in different behaviors: A clean move should move <source> to <destination> in the index (do *not* create <destination> in the worktree), then delete <source> from the worktree. A dirty move should move the <source> to the <destination>, both in the working tree and the index, but should *not* remove the resulted path from the working tree and should *not* turn on its CE_SKIP_WORKTREE bit. Optional reading ================ We are strict about cone mode when <destination> is a file path. The reason is that some of the previous tests that use no-cone mode in t7002 are keep breaking, mainly because the `dst_mode = SPARSE;` line added in this patch. Most features developed in both "from-out-to-in" and "from-in-to-out" only care about cone mode situation, as no-cone mode is becoming irrelevant. And because assigning `SPARSE` to `dst_mode` when the repo is in no-cone mode causes miscellaneous bugs, we should just leave this new functionality to be exclusive cone mode and save some time. Helped-by: Derrick Stolee <derrickstolee@github.com> Helped-by: Victoria Dye <vdye@github.com> Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-08-09 12:09:07 +00:00
test_expect_success 'move dirty path from in-cone to out-of-cone' '
test_when_finished "cleanup_sparse_checkout" &&
setup_sparse_checkout &&
echo "modified" >>sub/d &&
test_must_fail git mv sub/d folder1 2>stderr &&
cat sparse_error_header >expect &&
echo "folder1/d" >>expect &&
cat sparse_hint >>expect &&
test_cmp expect stderr &&
git mv --sparse sub/d folder1 2>stderr &&
cat dirty_error_header >expect &&
echo "folder1/d" >>expect &&
cat dirty_hint >>expect &&
test_cmp expect stderr &&
test_path_is_missing sub/d &&
test_path_is_file folder1/d &&
git ls-files -t >actual &&
! grep "^H sub/d\$" actual &&
grep "H folder1/d" actual
'
mv: from in-cone to out-of-cone Originally, moving an in-cone <source> to an out-of-cone <destination> was not possible, mainly because such <destination> is a directory that is not present in the working tree. Change the behavior so that we can move an in-cone <source> to out-of-cone <destination> when --sparse is supplied. Notice that <destination> can also be an out-of-cone file path, rather than a directory. Such <source> can be either clean or dirty, and moving it results in different behaviors: A clean move should move <source> to <destination> in the index (do *not* create <destination> in the worktree), then delete <source> from the worktree. A dirty move should move the <source> to the <destination>, both in the working tree and the index, but should *not* remove the resulted path from the working tree and should *not* turn on its CE_SKIP_WORKTREE bit. Optional reading ================ We are strict about cone mode when <destination> is a file path. The reason is that some of the previous tests that use no-cone mode in t7002 are keep breaking, mainly because the `dst_mode = SPARSE;` line added in this patch. Most features developed in both "from-out-to-in" and "from-in-to-out" only care about cone mode situation, as no-cone mode is becoming irrelevant. And because assigning `SPARSE` to `dst_mode` when the repo is in no-cone mode causes miscellaneous bugs, we should just leave this new functionality to be exclusive cone mode and save some time. Helped-by: Derrick Stolee <derrickstolee@github.com> Helped-by: Victoria Dye <vdye@github.com> Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-08-09 12:09:07 +00:00
test_expect_success 'move dir from in-cone to out-of-cone' '
test_when_finished "cleanup_sparse_checkout" &&
setup_sparse_checkout &&
mkdir sub/dir/deep &&
test_must_fail git mv sub/dir folder1 2>stderr &&
cat sparse_error_header >expect &&
echo "folder1/dir/e" >>expect &&
cat sparse_hint >>expect &&
test_cmp expect stderr &&
git mv --sparse sub/dir folder1 2>stderr &&
test_must_be_empty stderr &&
test_path_is_missing sub/dir &&
test_path_is_missing folder1 &&
git ls-files -t >actual &&
! grep "H sub/dir/e" actual &&
grep "S folder1/dir/e" actual
'
mv: from in-cone to out-of-cone Originally, moving an in-cone <source> to an out-of-cone <destination> was not possible, mainly because such <destination> is a directory that is not present in the working tree. Change the behavior so that we can move an in-cone <source> to out-of-cone <destination> when --sparse is supplied. Notice that <destination> can also be an out-of-cone file path, rather than a directory. Such <source> can be either clean or dirty, and moving it results in different behaviors: A clean move should move <source> to <destination> in the index (do *not* create <destination> in the worktree), then delete <source> from the worktree. A dirty move should move the <source> to the <destination>, both in the working tree and the index, but should *not* remove the resulted path from the working tree and should *not* turn on its CE_SKIP_WORKTREE bit. Optional reading ================ We are strict about cone mode when <destination> is a file path. The reason is that some of the previous tests that use no-cone mode in t7002 are keep breaking, mainly because the `dst_mode = SPARSE;` line added in this patch. Most features developed in both "from-out-to-in" and "from-in-to-out" only care about cone mode situation, as no-cone mode is becoming irrelevant. And because assigning `SPARSE` to `dst_mode` when the repo is in no-cone mode causes miscellaneous bugs, we should just leave this new functionality to be exclusive cone mode and save some time. Helped-by: Derrick Stolee <derrickstolee@github.com> Helped-by: Victoria Dye <vdye@github.com> Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-08-09 12:09:07 +00:00
test_expect_success 'move partially-dirty dir from in-cone to out-of-cone' '
test_when_finished "cleanup_sparse_checkout" &&
setup_sparse_checkout &&
mkdir sub/dir/deep &&
touch sub/dir/e2 sub/dir/e3 &&
git add sub/dir/e2 sub/dir/e3 &&
echo "modified" >>sub/dir/e2 &&
echo "modified" >>sub/dir/e3 &&
test_must_fail git mv sub/dir folder1 2>stderr &&
cat sparse_error_header >expect &&
echo "folder1/dir/e" >>expect &&
echo "folder1/dir/e2" >>expect &&
echo "folder1/dir/e3" >>expect &&
cat sparse_hint >>expect &&
test_cmp expect stderr &&
git mv --sparse sub/dir folder1 2>stderr &&
cat dirty_error_header >expect &&
echo "folder1/dir/e2" >>expect &&
echo "folder1/dir/e3" >>expect &&
cat dirty_hint >>expect &&
test_cmp expect stderr &&
test_path_is_missing sub/dir &&
test_path_is_missing folder1/dir/e &&
test_path_is_file folder1/dir/e2 &&
test_path_is_file folder1/dir/e3 &&
git ls-files -t >actual &&
! grep "H sub/dir/e" actual &&
! grep "H sub/dir/e2" actual &&
! grep "H sub/dir/e3" actual &&
grep "S folder1/dir/e" actual &&
grep "H folder1/dir/e2" actual &&
grep "H folder1/dir/e3" actual
'
test_done