submodule.c: remove implicit dependency on the_index

diff --git a/builtin/commit.c b/builtin/commit.c
index 21277dd42e8e2ea60e42eb770f57502997fd63de..bf06fbf49f0f996f6430eda469a7f580b55d5a83 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1647,11 +1647,11 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
        unlink(git_path_squash_msg(the_repository));
 
        if (commit_index_files())
-               die (_("Repository has been updated, but unable to write\n"
-                    "new_index file. Check that disk is not full and quota is\n"
-                    "not exceeded, and then \"git reset HEAD\" to recover."));
+               die(_("repository has been updated, but unable to write\n"
+                     "new_index file. Check that disk is not full and quota is\n"
+                     "not exceeded, and then \"git reset HEAD\" to recover."));
 
-       rerere(0);
+       repo_rerere(the_repository, 0);
        run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
        run_commit_hook(use_editor, get_index_file(), "post-commit", NULL);
        if (amend && !no_post_rewrite) {