X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-mv.c;h=5530e11b89c2c05c95c8ab1e82999eec0fdcc4c5;hb=af9a01e1c2f6a8814b817eb7f3d78814389a3212;hp=94f6dd2aad2da512bab0be2e84859eced6553cc9;hpb=32a27b56662b1c7aa13f98c95f170ba5290c7559;p=git.git diff --git a/builtin-mv.c b/builtin-mv.c index 94f6dd2aa..5530e11b8 100644 --- 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,8 @@ 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; - add_file_to_cache(path, verbose); + if (add_file_to_cache(path, verbose ? ADD_CACHE_VERBOSE : 0)) + die("updating index entries failed"); } for (i = 0; i < deleted.nr; i++)