Originally, moving a <source> file which is not on-disk but exists in
index as a SKIP_WORKTREE enabled cache entry, "giv mv" command errors
out with "bad source".
Change the checking logic, so that such <source>
file makes "giv mv" command warns with "advise_on_updating_sparse_paths()"
instead of "bad source"; also user now can supply a "--sparse" flag so
this operation can be carried out successfully.
Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@xxxxxxxxx>
---
builtin/mv.c | 26 +++++++++++++++++++++++++-
t/t7002-mv-sparse-checkout.sh | 4 ++--
2 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/builtin/mv.c b/builtin/mv.c
index 83a465ba83..32ad4d5682 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -185,8 +185,32 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
length = strlen(src);
if (lstat(src, &st) < 0) {
+ /*
+ * TODO: for now, when you try to overwrite a <destination>
+ * with your <source> as a sparse file, if you supply a "--sparse"
+ * flag, then the action will be done without providing "--force"
+ * and no warning.
+ *
+ * This is mainly because the sparse <source>
+ * is not on-disk, and this if-else chain will be cut off early in
+ * this check, thus the "--force" check is ignored. Need fix.
+ */
+
+ int pos = cache_name_pos(src, length);
+ if (pos >= 0) {
+ const struct cache_entry *ce = active_cache[pos];
+
+ if (ce_skip_worktree(ce)) {
+ if (!ignore_sparse)
+ string_list_append(&only_match_skip_worktree, src);
+ else
+ modes[i] = SPARSE;
+ }
+ else
+ bad = _("bad source");
+ }
/* only error if existence is expected. */
- if (modes[i] != SPARSE)
+ else if (modes[i] != SPARSE)
bad = _("bad source");
} else if (!strncmp(src, dst, length) &&
(dst[length] == 0 || dst[length] == '/')) {
diff --git a/t/t7002-mv-sparse-checkout.sh b/t/t7002-mv-sparse-checkout.sh
index 963cb512e2..581ef4c0f6 100755
--- a/t/t7002-mv-sparse-checkout.sh
+++ b/t/t7002-mv-sparse-checkout.sh
@@ -239,7 +239,7 @@ test_expect_failure 'can move out-of-cone directory with --sparse' '
test_path_is_file sub/folder1/file1
'
-test_expect_failure 'refuse to move out-of-cone file without --sparse' '
+test_expect_success 'refuse to move out-of-cone file without --sparse' '
git sparse-checkout disable &&
git reset --hard &&
mkdir folder1 &&
@@ -255,7 +255,7 @@ test_expect_failure 'refuse to move out-of-cone file without --sparse' '
test_cmp expect stderr
'
-test_expect_failure 'can move out-of-cone file with --sparse' '
+test_expect_success 'can move out-of-cone file with --sparse' '
git sparse-checkout disable &&
git reset --hard &&
mkdir folder1 &&
--
2.35.1
