Merge branch 'ab/simplify-perl-makefile'

diff --git a/builtin/mv.c b/builtin/mv.c
index ffdd5f01a190b99407d1019972e3198c42b7194c..8ce6a2ddd4c5008c9d32d45dc21e11d97ff8b79d 100644 (file)
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -286,12 +286,11 @@ 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)
-               stage_updated_gitmodules();
+               stage_updated_gitmodules(&the_index);
 
        if (active_cache_changed &&
            write_locked_index(&the_index, &lock_file, COMMIT_LOCK))