Merge branch 'mh/separate-ref-cache'

diff --git a/builtin/mv.c b/builtin/mv.c
index 4e86dc5234ee6258b2513b410365de94fa9f6272..61d20037add7cf56df721f8d69612b50412f94e9 100644 (file)
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -138,7 +138,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
        if (--argc < 1)
                usage_with_options(builtin_mv_usage, builtin_mv_options);
 
-       hold_locked_index(&lock_file, 1);
+       hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
        if (read_cache() < 0)
                die(_("index file corrupt"));