mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'js/mv-dir-to-new-directory' into maint
"git mv dir non-existing-dir/" did not work in some environments the same way as existing mainstream platforms. The code now moves "dir" to "non-existing-dir", without relying on rename("A", "B/") that strips the trailing slash of '/'. * js/mv-dir-to-new-directory: git mv: do not keep slash in `git mv dir non-existing-dir/`
This commit is contained in:
commit
8e7c580e34
11
builtin/mv.c
11
builtin/mv.c
|
@ -104,7 +104,7 @@ static int index_range_of_same_dir(const char *src, int length,
|
|||
|
||||
int cmd_mv(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
int i, gitmodules_modified = 0;
|
||||
int i, flags, gitmodules_modified = 0;
|
||||
int verbose = 0, show_only = 0, force = 0, ignore_errors = 0;
|
||||
struct option builtin_mv_options[] = {
|
||||
OPT__VERBOSE(&verbose, N_("be verbose")),
|
||||
|
@ -134,10 +134,13 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
|
|||
modes = xcalloc(argc, sizeof(enum update_mode));
|
||||
/*
|
||||
* Keep trailing slash, needed to let
|
||||
* "git mv file no-such-dir/" error out.
|
||||
* "git mv file no-such-dir/" error out, except in the case
|
||||
* "git mv directory no-such-dir/".
|
||||
*/
|
||||
dest_path = internal_copy_pathspec(prefix, argv + argc, 1,
|
||||
KEEP_TRAILING_SLASH);
|
||||
flags = KEEP_TRAILING_SLASH;
|
||||
if (argc == 1 && is_directory(argv[0]) && !is_directory(argv[1]))
|
||||
flags = 0;
|
||||
dest_path = internal_copy_pathspec(prefix, argv + argc, 1, flags);
|
||||
submodule_gitfile = xcalloc(argc, sizeof(char *));
|
||||
|
||||
if (dest_path[0][0] == '\0')
|
||||
|
|
Loading…
Reference in a new issue