[RFC PATCH 1/1] mv: integrate with sparse-index
Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com>
---
builtin/mv.c | 3 +++
t/t1092-sparse-checkout-compatibility.sh | 34 ++++++++++++++++++++++++
2 files changed, 37 insertions(+)
diff --git a/builtin/mv.c b/builtin/mv.c
index 83a465ba83..111360ebf5 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -138,6 +138,9 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
git_config(git_default_config, NULL);
+ prepare_repo_settings(the_repository);
+ the_repository->settings.command_requires_full_index = 0;
+
argc = parse_options(argc, argv, prefix, builtin_mv_options,
builtin_mv_usage, 0);
if (--argc < 1)
diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh
index 2a04b532f9..0a8164c5f6 100755
--- a/t/t1092-sparse-checkout-compatibility.sh
+++ b/t/t1092-sparse-checkout-compatibility.sh
@@ -1521,4 +1521,38 @@ test_expect_success 'checkout behaves oddly with df-conflict-2' '
test_cmp full-checkout-err sparse-index-err
'
+test_expect_success 'mv' '
+ init_repos &&
+
+ # test first form <source> <destination>
+ test_all_match git mv deep/a deep/a_mod &&
+ test_all_match git mv deep/deeper1 deep/deeper1_mod &&
+ test_all_match git mv deep/deeper2/deeper1/deepest2/a \
+ deep/deeper2/deeper1/deepest2/a_mod &&
+
+ run_on_all git reset --hard &&
+
+ test_all_match git mv -f deep/a deep/before/a &&
+ test_all_match git mv -f deep/before/a deep/a &&
+
+ run_on_all git reset --hard &&
+
+ test_all_match git mv -k deep/a deep/before/a &&
+ test_all_match git mv -k deep/before/a deep/a &&
+
+ run_on_all git reset --hard &&
+
+ test_all_match git mv -v deep/a deep/a_mod &&
+ test_all_match git mv -v deep/deeper1 deep/deeper1_mod &&
+ test_all_match git mv -v deep/deeper2/deeper1/deepest2/a \
+ deep/deeper2/deeper1/deepest2/a_mod &&
+
+ # test second form <source> ... <destination directory>
+ run_on_all git reset --hard &&
+ run_on_all mkdir deep/folder &&
+ test_all_match git mv deep/a deep/folder &&
+ test_all_match git mv -v deep/deeper1 deep/folder &&
+ test_all_match git mv -f deep/deeper2/deeper1/deepest2/a deep/folder
+'
+
test_done
--
2.35.1
Shaoxuan Yuan <shaoxuan.yuan02@gmail.com>