merge-recursive: Small code clarification -- variable name and comments

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 89a1f12d615bb997bd992abba61da712def3ea44..2e680d7a7ac3495c9d6bd10e0fa6a6ae28bb8670 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -880,12 +880,12 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
        char *index_name_buf = NULL, *keep_name_buf = NULL;
        struct pack_idx_entry **idx_objects;
        unsigned char pack_sha1[20];
-       int nongit;
 
        if (argc == 2 && !strcmp(argv[1], "-h"))
                usage(index_pack_usage);
 
-       prefix = setup_git_directory_gently(&nongit);
+       read_replace_refs = 0;
+
        git_config(git_index_pack_config, NULL);
        if (prefix && chdir(prefix))
                die("Cannot come back to cwd");