зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
c57f6281ff
Коммит
a893346930
|
@ -214,6 +214,8 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
|
|||
}
|
||||
} else if (string_list_has_string(&src_for_dst, dst))
|
||||
bad = _("multiple sources for the same target");
|
||||
else if (is_dir_sep(dst[strlen(dst) - 1]))
|
||||
bad = _("destination directory does not exist");
|
||||
else
|
||||
string_list_insert(&src_for_dst, dst);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче