aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2024-04-18 14:14:24 +0200
committerJunio C Hamano <gitster@pobox.com>2024-04-18 12:30:42 -0700
commit9ee6d63babb8beaace8c654df6c65ff61f3697b8 (patch)
tree7d344942c722666eab8615b6d3a650a771b4c88a
parentrepository: initialize index in `repo_init()` (diff)
downloadgit-9ee6d63babb8beaace8c654df6c65ff61f3697b8.tar.xz
git-9ee6d63babb8beaace8c654df6c65ff61f3697b8.zip
builtin/clone: stop using `the_index`
Convert git-clone(1) 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>
-rw-r--r--builtin/clone.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/builtin/clone.c b/builtin/clone.c
index 74ec14542e8..93fdfc945a2 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -8,7 +8,6 @@
* Clone a repository into a different directory that does not yet exist.
*/
-#define USE_THE_INDEX_VARIABLE
#include "builtin.h"
#include "abspath.h"
#include "advice.h"
@@ -731,8 +730,8 @@ static int checkout(int submodule_progress, int filter_submodules)
opts.preserve_ignored = 0;
opts.fn = oneway_merge;
opts.verbose_update = (option_verbosity >= 0);
- opts.src_index = &the_index;
- opts.dst_index = &the_index;
+ opts.src_index = the_repository->index;
+ opts.dst_index = the_repository->index;
init_checkout_metadata(&opts.meta, head, &oid, NULL);
tree = parse_tree_indirect(&oid);
@@ -746,7 +745,7 @@ static int checkout(int submodule_progress, int filter_submodules)
free(head);
- if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
+ if (write_locked_index(the_repository->index, &lock_file, COMMIT_LOCK))
die(_("unable to write new index file"));
err |= run_hooks_l("post-checkout", oid_to_hex(null_oid()),