Merge branch 'sb/repack-in-c' into maint

diff --git a/builtin/mv.c b/builtin/mv.c
index aec79d18386b52a943b20e6ebe0dfc9b6f074f0f..21c46d1636e6e87dd9eaaca60ac08ebbbc4efec3 100644 (file)
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -16,9 +16,12 @@ static const char * const builtin_mv_usage[] = {
        NULL
 };
 
+#define DUP_BASENAME 1
+#define KEEP_TRAILING_SLASH 2
+
 static const char **internal_copy_pathspec(const char *prefix,
                                           const char **pathspec,
-                                          int count, int base_name)
+                                          int count, unsigned flags)
 {
        int i;
        const char **result = xmalloc((count + 1) * sizeof(const char *));
@@ -27,11 +30,12 @@ static const char **internal_copy_pathspec(const char *prefix,
        for (i = 0; i < count; i++) {
                int length = strlen(result[i]);
                int to_copy = length;
-               while (to_copy > 0 && is_dir_sep(result[i][to_copy - 1]))
+               while (!(flags & KEEP_TRAILING_SLASH) &&
+                      to_copy > 0 && is_dir_sep(result[i][to_copy - 1]))
                        to_copy--;
-               if (to_copy != length || base_name) {
+               if (to_copy != length || flags & DUP_BASENAME) {
                        char *it = xmemdupz(result[i], to_copy);
-                       if (base_name) {
+                       if (flags & DUP_BASENAME) {
                                result[i] = xstrdup(basename(it));
                                free(it);
                        } else
@@ -55,6 +59,7 @@ static const char *add_slash(const char *path)
 }
 
 static struct lock_file lock_file;
+#define SUBMODULE_WITH_GITDIR ((const char *)1)
 
 int cmd_mv(int argc, const char **argv, const char *prefix)
 {
@@ -86,16 +91,21 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
 
        source = internal_copy_pathspec(prefix, argv, argc, 0);
        modes = xcalloc(argc, sizeof(enum update_mode));
-       dest_path = internal_copy_pathspec(prefix, argv + argc, 1, 0);
+       /*
+        * Keep trailing slash, needed to let
+        * "git mv file no-such-dir/" error out.
+        */
+       dest_path = internal_copy_pathspec(prefix, argv + argc, 1,
+                                          KEEP_TRAILING_SLASH);
        submodule_gitfile = xcalloc(argc, sizeof(char *));
 
        if (dest_path[0][0] == '\0')
                /* special case: "." was normalized to "" */
-               destination = internal_copy_pathspec(dest_path[0], argv, argc, 1);
+               destination = internal_copy_pathspec(dest_path[0], argv, argc, DUP_BASENAME);
        else if (!lstat(dest_path[0], &st) &&
                        S_ISDIR(st.st_mode)) {
                dest_path[0] = add_slash(dest_path[0]);
-               destination = internal_copy_pathspec(dest_path[0], argv, argc, 1);
+               destination = internal_copy_pathspec(dest_path[0], argv, argc, DUP_BASENAME);
        } else {
                if (argc != 1)
                        die("destination '%s' is not a directory", dest_path[0]);
@@ -132,6 +142,8 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
                                submodule_gitfile[i] = read_gitfile(submodule_dotgit.buf);
                                if (submodule_gitfile[i])
                                        submodule_gitfile[i] = xstrdup(submodule_gitfile[i]);
+                               else
+                                       submodule_gitfile[i] = SUBMODULE_WITH_GITDIR;
                                strbuf_release(&submodule_dotgit);
                        } else {
                                const char *src_w_slash = add_slash(src);
@@ -202,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);
 
@@ -230,10 +244,12 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
                if (!show_only && mode != INDEX) {
                        if (rename(src, dst) < 0 && !ignore_errors)
                                die_errno (_("renaming '%s' failed"), src);
-                       if (submodule_gitfile[i])
-                               connect_work_tree_and_git_dir(dst, submodule_gitfile[i]);
-                       if (!update_path_in_gitmodules(src, dst))
-                               gitmodules_modified = 1;
+                       if (submodule_gitfile[i]) {
+                               if (submodule_gitfile[i] != SUBMODULE_WITH_GITDIR)
+                                       connect_work_tree_and_git_dir(dst, submodule_gitfile[i]);
+                               if (!update_path_in_gitmodules(src, dst))
+                                       gitmodules_modified = 1;
+                       }
                }
 
                if (mode == WORKING_DIRECTORY)