mv: let 'git mv file no-such-dir/' error out on Windows, too
The previous commit c57f628 (mv: let 'git mv file no-such-dir/' error out) relies on that rename("file", "no-such-dir/") fails if the directory does not exist (note the trailing slash). This does not work as expected on Windows: This rename() call does not fail, but renames "file" to "no-such-dir" (not to "no-such-dir/file"). Insert an explicit check for this case to force an error. This changes the error message from $ git mv file no-such-dir/ fatal: renaming 'file' failed: Not a directory to $ git mv file no-such-dir/ fatal: destination directory does not exist, source=file, destination=no-such-dir/ Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Sixt committed
Jan 8, 2014 at 17:33 UTC
a8933469309c492ad69af3f25bfddc7b245ab9c3
1 file changed
+2
builtin/mv.c
+2
@@ -214,6 +214,8 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
214
}
215
} else if (string_list_has_string(&src_for_dst, dst))
216
bad = _("multiple sources for the same target");
217
+ else if (is_dir_sep(dst[strlen(dst) - 1]))
218
+ bad = _("destination directory does not exist");
219
else
220
string_list_insert(&src_for_dst, dst);
221