Merge branch 'nd/parseopt-completion' into next

diff --git a/builtin/mv.c b/builtin/mv.c
index e3e308d282f45ac0e8e68be6732043f0cd039d96..8eceb310aae5f8007475f571a0146832eab0be49 100644 (file)
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -287,8 +287,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
 
                pos = cache_name_pos(src, strlen(src));
                assert(pos >= 0);
-               if (!show_only)
-                       rename_cache_entry_at(pos, dst);
+               rename_cache_entry_at(pos, dst);
        }
 
        if (gitmodules_modified)