Johannes Sixt <j6t@xxxxxxxx> writes:
> The previous commit c57f628 (mv: let 'git mv file no-such-dir/' error out)
> relies on that rename("src", "dst/") fails if directory dst does not
> exist (note the trailing slash). This does not work as expected on Windows:
> This rename() call is successful. Insert an explicit check for this case.
Could you care to explain "Successful how" a bit here? Do we see
no-such-dir mkdir'ed and then no-such-dir/file created? Do we see
file moved to a new file whose name is no-such-dir/? I am guessing
that it would be the latter, but if that is the case we would need
at least an air-quote around "successful".
> 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@xxxxxxxx>
> ---
> builtin/mv.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/builtin/mv.c b/builtin/mv.c
> index 08fbc03..21c46d1 100644
> --- a/builtin/mv.c
> +++ b/builtin/mv.c
> @@ -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);
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html