builtin: stop using `the_index`

[thirdparty/git.git] / builtin / merge.c

diff --git a/builtin/merge.c b/builtin/merge.c
index 6f4fec87fcd0e64af4017c0a4adf32ec655cc224..6a6d37988589d804184adfe4a5b00150d15b5b96 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -6,7 +6,6 @@
  * Based on git-merge.sh by Junio C Hamano.
  */
 
-#define USE_THE_INDEX_VARIABLE
 #include "builtin.h"
 #include "abspath.h"
 #include "advice.h"
@@ -300,7 +299,7 @@ static int save_state(struct object_id *stash)
        int rc = -1;
 
        fd = repo_hold_locked_index(the_repository, &lock_file, 0);
-       refresh_index(&the_index, REFRESH_QUIET, NULL, NULL, NULL);
+       refresh_index(the_repository->index, REFRESH_QUIET, NULL, NULL, NULL);
        if (0 <= fd)
                repo_update_index_if_able(the_repository, &lock_file);
        rollback_lock_file(&lock_file);
@@ -372,7 +371,7 @@ static void restore_state(const struct object_id *head,
        run_command(&cmd);
 
 refresh_cache:
-       discard_index(&the_index);
+       discard_index(the_repository->index);
        if (repo_read_index(the_repository) < 0)
                die(_("could not read index"));
 }
@@ -657,8 +656,8 @@ static int read_tree_trivial(struct object_id *common, struct object_id *head,
 
        memset(&opts, 0, sizeof(opts));
        opts.head_idx = 2;
-       opts.src_index = &the_index;
-       opts.dst_index = &the_index;
+       opts.src_index = the_repository->index;
+       opts.dst_index = the_repository->index;
        opts.update = 1;
        opts.verbose_update = 1;
        opts.trivial_merges_only = 1;
@@ -674,7 +673,7 @@ static int read_tree_trivial(struct object_id *common, struct object_id *head,
        if (!trees[nr_trees++])
                return -1;
        opts.fn = threeway_merge;
-       cache_tree_free(&the_index.cache_tree);
+       cache_tree_free(&the_repository->index->cache_tree);
        for (i = 0; i < nr_trees; i++) {
                parse_tree(trees[i]);
                init_tree_desc(t+i, &trees[i]->object.oid,
@@ -687,7 +686,7 @@ static int read_tree_trivial(struct object_id *common, struct object_id *head,
 
 static void write_tree_trivial(struct object_id *oid)
 {
-       if (write_index_as_tree(oid, &the_index, get_index_file(), 0, NULL))
+       if (write_index_as_tree(oid, the_repository->index, get_index_file(), 0, NULL))
                die(_("git write-tree failed to write a tree"));
 }
 
@@ -745,7 +744,7 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
                        rollback_lock_file(&lock);
                        return 2;
                }
-               if (write_locked_index(&the_index, &lock,
+               if (write_locked_index(the_repository->index, &lock,
                                       COMMIT_LOCK | SKIP_IF_UNCHANGED))
                        die(_("unable to write %s"), get_index_file());
                return clean ? 0 : 1;
@@ -768,8 +767,8 @@ static int count_unmerged_entries(void)
 {
        int i, ret = 0;
 
-       for (i = 0; i < the_index.cache_nr; i++)
-               if (ce_stage(the_index.cache[i]))
+       for (i = 0; i < the_repository->index->cache_nr; i++)
+               if (ce_stage(the_repository->index->cache[i]))
                        ret++;
 
        return ret;
@@ -843,9 +842,9 @@ static void prepare_to_commit(struct commit_list *remoteheads)
                 * the editor and after we invoke run_status above.
                 */
                if (invoked_hook)
-                       discard_index(&the_index);
+                       discard_index(the_repository->index);
        }
-       read_index_from(&the_index, index_file, get_git_dir());
+       read_index_from(the_repository->index, index_file, get_git_dir());
        strbuf_addbuf(&msg, &merge_msg);
        if (squash)
                BUG("the control must not reach here under --squash");
@@ -957,7 +956,7 @@ static int suggest_conflicts(void)
         * Thus, we will get the cleanup mode which is returned when we _are_
         * using an editor.
         */
-       append_conflicts_hint(&the_index, &msgbuf,
+       append_conflicts_hint(the_repository->index, &msgbuf,
                              get_cleanup_mode(cleanup_arg, 1));
        fputs(msgbuf.buf, fp);
        strbuf_release(&msgbuf);
@@ -1386,7 +1385,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
                else
                        die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."));
        }
-       resolve_undo_clear_index(&the_index);
+       resolve_undo_clear_index(the_repository->index);
 
        if (option_edit < 0)
                option_edit = default_edit_option();
@@ -1595,7 +1594,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
                 * We are not doing octopus, not fast-forward, and have
                 * only one common.
                 */
-               refresh_index(&the_index, REFRESH_QUIET, NULL, NULL, NULL);
+               refresh_index(the_repository->index, REFRESH_QUIET, NULL, NULL, NULL);
                if (allow_trivial && fast_forward != FF_ONLY) {
                        /*
                         * Must first ensure that index matches HEAD before
@@ -1784,6 +1783,6 @@ done:
        }
        strbuf_release(&buf);
        free(branch_to_free);
-       discard_index(&the_index);
+       discard_index(the_repository->index);
        return ret;
 }