summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorShaoxuan Yuan <shaoxuan.yuan02@gmail.com>2022-06-30 02:37:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-07-01 21:50:16 (GMT)
commit8a26a3915fbe1aab9786b28c535c8541f8df2a19 (patch)
treefc82c77a720b5cef9bbd6bcb28ffea472e1da9d0 /t
parent6645b03ca5af33bbce1001257ee22832559ec966 (diff)
downloadgit-8a26a3915fbe1aab9786b28c535c8541f8df2a19.zip
git-8a26a3915fbe1aab9786b28c535c8541f8df2a19.tar.gz
git-8a26a3915fbe1aab9786b28c535c8541f8df2a19.tar.bz2
mv: check if <destination> exists in index to handle overwriting
Originally, moving a sparse file into cone can result in unwarned overwrite of existing entry. The expected behavior is that if the <destination> exists in the entry, user should be prompted to supply a [-f|--force] to carry out the operation, or the operation should fail. Add a check mechanism to do that. Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com> Acked-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t7002-mv-sparse-checkout.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7002-mv-sparse-checkout.sh b/t/t7002-mv-sparse-checkout.sh
index 1510b5e..6d2fb4f 100755
--- a/t/t7002-mv-sparse-checkout.sh
+++ b/t/t7002-mv-sparse-checkout.sh
@@ -262,7 +262,7 @@ test_expect_success 'can move out-of-cone file with --sparse' '
test_path_is_file sub/file1
'
-test_expect_failure 'refuse to move sparse file to existing destination' '
+test_expect_success 'refuse to move sparse file to existing destination' '
test_when_finished "cleanup_sparse_checkout" &&
mkdir folder1 &&
touch folder1/file1 &&
@@ -275,7 +275,7 @@ test_expect_failure 'refuse to move sparse file to existing destination' '
test_cmp expect stderr
'
-test_expect_failure 'move sparse file to existing destination with --force and --sparse' '
+test_expect_success 'move sparse file to existing destination with --force and --sparse' '
test_when_finished "cleanup_sparse_checkout" &&
mkdir folder1 &&
touch folder1/file1 &&