rerere: Separate libgit and builtin functions

[thirdparty/git.git] / builtin-mv.c

diff --git a/builtin-mv.c b/builtin-mv.c
index fb8ffb41aaba5f6e2a8cc13207a2f2c407d6c91d..5530e11b89c2c05c95c8ab1e82999eec0fdcc4c5 100644 (file)
--- a/builtin-mv.c
+++ b/builtin-mv.c
@@ -81,7 +81,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
        struct path_list deleted = {NULL, 0, 0, 0};
        struct path_list changed = {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)
@@ -256,7 +256,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
 
                for (i = 0; i < added.nr; i++) {
                        const char *path = added.items[i].path;
-                       if (add_file_to_cache(path, verbose))
+                       if (add_file_to_cache(path, verbose ? ADD_CACHE_VERBOSE : 0))
                                die("updating index entries failed");
                }