diff options
| author | Patrick Steinhardt <ps@pks.im> | 2024-04-18 14:14:14 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-04-18 12:30:42 -0700 |
| commit | f59aa5e0a93242f73bf21e241fabe0c261f4b62a (patch) | |
| tree | 11b227b0b15fc34103be2c545501a22c904c939b /builtin/merge-tree.c | |
| parent | t/helper: stop using `the_index` (diff) | |
| download | git-f59aa5e0a93242f73bf21e241fabe0c261f4b62a.tar.gz git-f59aa5e0a93242f73bf21e241fabe0c261f4b62a.zip | |
builtin: stop using `the_index`
Convert builtins to use `the_repository->index` instead of `the_index`.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-tree.c')
| -rw-r--r-- | builtin/merge-tree.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index 8bdb439131..1082d919fd 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -1,4 +1,3 @@ -#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "tree-walk.h" #include "xdiff-interface.h" @@ -364,7 +363,7 @@ static void trivial_merge_trees(struct tree_desc t[3], const char *base) setup_traverse_info(&info, base); info.fn = threeway_callback; - traverse_trees(&the_index, 3, t, &info); + traverse_trees(the_repository->index, 3, t, &info); } static void *get_tree_descriptor(struct repository *r, |