read-cache: tweak racy-git delay logic

diff --git a/builtin-mv.c b/builtin-mv.c
index 42c2e39b2105db553b469f13da1d4211233d018e..e47942c13522b2bc8a83203c61071697c9a03307 100644 (file)
--- a/builtin-mv.c
+++ b/builtin-mv.c
@@ -56,11 +56,10 @@ static const char *add_slash(const char *path)
 
 static struct lock_file lock_file;
 
-int cmd_mv(int argc, const char **argv, char **envp)
+int cmd_mv(int argc, const char **argv, const char *prefix)
 {
        int i, newfd, count;
        int verbose = 0, show_only = 0, force = 0, ignore_errors = 0;
-       const char *prefix = setup_git_directory();
        const char **source, **destination, **dest_path;
        enum update_mode { BOTH = 0, WORKING_DIRECTORY, INDEX } *modes;
        struct stat st;
@@ -100,7 +99,7 @@ int cmd_mv(int argc, const char **argv, char **envp)
                        ignore_errors = 1;
                        continue;
                }
-               die(builtin_mv_usage);
+               usage(builtin_mv_usage);
        }
        count = argc - i - 1;
        if (count < 1)