@matheusbsbs / matheus-bagliano / commits / c08830de41

mv: check if <destination> is a SKIP_WORKTREE_DIR

Originally, <destination> is assumed to be in the working tree. If it is not found as a directory, then it is determined to be either a regular file path, or error out if used under the second form (move into a directory) of 'git-mv'. Such behavior is not ideal, mainly because Git does not look into the index for <destination>, which could potentially be a SKIP_WORKTREE_DIR, which we need to determine for the later "moving from in-cone to out-of-cone" patch. Change the logic so that Git first check if <destination> is a directory with all its contents sparsified (a SKIP_WORKTREE_DIR). If <destination> is such a sparse directory, then we should modify the index the same way as we would if this were a non-sparse directory. We must be careful to ensure that the <destination> is marked with SKIP_WORKTREE_DIR. Also add a `dst_w_slash` to reuse the result from `add_slash()`, which was everywhere and can be simplified. 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>

Shaoxuan Yuan committed Aug 9, 2022 at 20:09 UTC c08830de41f15a8ee85cf7926266e1db732ec773

1 file changed +14 -4

builtin/mv.c

+14 -4

@@ -171,6 +171,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)

171 OPT_END(),

172 };

173 const char **source, **destination, **dest_path, **submodule_gitfile;

174 + const char *dst_w_slash;

175 enum update_mode *modes;

176 struct stat st;

177 struct string_list src_for_dst = STRING_LIST_INIT_NODUP;

@@ -200,6 +201,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)

201 if (argc == 1 && is_directory(argv[0]) && !is_directory(argv[1]))

202 flags = 0;

203 dest_path = internal_prefix_pathspec(prefix, argv + argc, 1, flags);

204 + dst_w_slash = add_slash(dest_path[0]);

205 submodule_gitfile = xcalloc(argc, sizeof(char *));

206

207 if (dest_path[0][0] == '\0')

@@ -207,12 +209,20 @@ int cmd_mv(int argc, const char **argv, const char *prefix)

209 destination = internal_prefix_pathspec(dest_path[0], argv, argc, DUP_BASENAME);

210 else if (!lstat(dest_path[0], &st) &&

211 S_ISDIR(st.st_mode)) {

210 - dest_path[0] = add_slash(dest_path[0]);

211 - destination = internal_prefix_pathspec(dest_path[0], argv, argc, DUP_BASENAME);

212 + destination = internal_prefix_pathspec(dst_w_slash, argv, argc, DUP_BASENAME);

213 } else {

213 - if (argc != 1)

214 + if (!path_in_sparse_checkout(dst_w_slash, &the_index) &&

215 + empty_dir_has_sparse_contents(dst_w_slash)) {

216 + destination = internal_prefix_pathspec(dst_w_slash, argv, argc, DUP_BASENAME);

217 + } else if (argc != 1) {

218 die(_("destination '%s' is not a directory"), dest_path[0]);

215 - destination = dest_path;

219 + } else {

220 + destination = dest_path;

221 + }

222 + }

223 + if (dst_w_slash != dest_path[0]) {

224 + free((char *)dst_w_slash);

225 + dst_w_slash = NULL;

226 }

227

228 /* Checking */