Merge branch 'dl/xdiff'

diff --git a/builtin-mv.c b/builtin-mv.c
index 94f6dd2aad2da512bab0be2e84859eced6553cc9..4f65b5ae9baf66953e79886fd93fe31786b24d36 100644 (file)
--- a/builtin-mv.c
+++ b/builtin-mv.c
@@ -7,11 +7,11 @@
 #include "builtin.h"
 #include "dir.h"
 #include "cache-tree.h"
-#include "path-list.h"
+#include "string-list.h"
 #include "parse-options.h"
 
 static const char * const builtin_mv_usage[] = {
-       "git-mv [options] <source>... <destination>",
+       "git mv [options] <source>... <destination>",
        NULL
 };
 
@@ -36,17 +36,6 @@ static const char **copy_pathspec(const char *prefix, const char **pathspec,
        return get_pathspec(prefix, result);
 }
 
-static void show_list(const char *label, struct path_list *list)
-{
-       if (list->nr > 0) {
-               int i;
-               printf("%s", label);
-               for (i = 0; i < list->nr; i++)
-                       printf("%s%s", i > 0 ? ", " : "", list->items[i].path);
-               putchar('\n');
-       }
-}
-
 static const char *add_slash(const char *path)
 {
        int len = strlen(path);
@@ -75,13 +64,9 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
        const char **source, **destination, **dest_path;
        enum update_mode { BOTH = 0, WORKING_DIRECTORY, INDEX } *modes;
        struct stat st;
-       struct path_list overwritten = {NULL, 0, 0, 0};
-       struct path_list src_for_dst = {NULL, 0, 0, 0};
-       struct path_list added = {NULL, 0, 0, 0};
-       struct path_list deleted = {NULL, 0, 0, 0};
-       struct path_list changed = {NULL, 0, 0, 0};
+       struct string_list src_for_dst = {NULL, 0, 0, 0};
 
-       git_config(git_default_config);
+       git_config(git_default_config, NULL);
 
        newfd = hold_locked_index(&lock_file, 1);
        if (read_cache() < 0)
@@ -184,21 +169,20 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
                                 * only files can overwrite each other:
                                 * check both source and destination
                                 */
-                               if (S_ISREG(st.st_mode)) {
+                               if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)) {
                                        fprintf(stderr, "Warning: %s;"
                                                        " will overwrite!\n",
                                                        bad);
                                        bad = NULL;
-                                       path_list_insert(dst, &overwritten);
                                } else
                                        bad = "Cannot overwrite";
                        }
                } else if (cache_name_pos(src, length) < 0)
                        bad = "not under version control";
-               else if (path_list_has_path(&src_for_dst, dst))
+               else if (string_list_has_string(&src_for_dst, dst))
                        bad = "multiple sources for the same target";
                else
-                       path_list_insert(dst, &src_for_dst);
+                       string_list_insert(dst, &src_for_dst);
 
                if (bad) {
                        if (ignore_errors) {
@@ -218,6 +202,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
        for (i = 0; i < argc; i++) {
                const char *src = source[i], *dst = destination[i];
                enum update_mode mode = modes[i];
+               int pos;
                if (show_only || verbose)
                        printf("Renaming %s to %s\n", src, dst);
                if (!show_only && mode != INDEX &&
@@ -227,46 +212,16 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
                if (mode == WORKING_DIRECTORY)
                        continue;
 
-               if (cache_name_pos(src, strlen(src)) >= 0) {
-                       path_list_insert(src, &deleted);
-
-                       /* destination can be a directory with 1 file inside */
-                       if (path_list_has_path(&overwritten, dst))
-                               path_list_insert(dst, &changed);
-                       else
-                               path_list_insert(dst, &added);
-               } else
-                       path_list_insert(dst, &added);
+               pos = cache_name_pos(src, strlen(src));
+               assert(pos >= 0);
+               if (!show_only)
+                       rename_cache_entry_at(pos, dst);
        }
 
-       if (show_only) {
-               show_list("Changed  : ", &changed);
-               show_list("Adding   : ", &added);
-               show_list("Deleting : ", &deleted);
-       } else {
-               for (i = 0; i < changed.nr; i++) {
-                       const char *path = changed.items[i].path;
-                       int j = cache_name_pos(path, strlen(path));
-                       struct cache_entry *ce = active_cache[j];
-
-                       if (j < 0)
-                               die ("Huh? Cache entry for %s unknown?", path);
-                       refresh_cache_entry(ce, 0);
-               }
-
-               for (i = 0; i < added.nr; i++) {
-                       const char *path = added.items[i].path;
-                       add_file_to_cache(path, verbose);
-               }
-
-               for (i = 0; i < deleted.nr; i++)
-                       remove_file_from_cache(deleted.items[i].path);
-
-               if (active_cache_changed) {
-                       if (write_cache(newfd, active_cache, active_nr) ||
-                           commit_locked_index(&lock_file))
-                               die("Unable to write new index file");
-               }
+       if (active_cache_changed) {
+               if (write_cache(newfd, active_cache, active_nr) ||
+                   commit_locked_index(&lock_file))
+                       die("Unable to write new index file");
        }
 
        return 0;