From f59aa5e0a93242f73bf21e241fabe0c261f4b62a Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Thu, 18 Apr 2024 14:14:14 +0200 Subject: builtin: stop using `the_index` Convert builtins to use `the_repository->index` instead of `the_index`. Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano --- builtin/pull.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'builtin/pull.c') diff --git a/builtin/pull.c b/builtin/pull.c index 72cbb76d52..66869210db 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -5,7 +5,7 @@ * * Fetch one or more remote refs and merge it/them into the current HEAD. */ -#define USE_THE_INDEX_VARIABLE + #include "builtin.h" #include "advice.h" #include "config.h" @@ -1044,7 +1044,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix) if (opt_autostash == -1) opt_autostash = config_autostash; - if (is_null_oid(&orig_head) && !is_index_unborn(&the_index)) + if (is_null_oid(&orig_head) && !is_index_unborn(the_repository->index)) die(_("Updating an unborn branch with changes added to the index.")); if (!opt_autostash) -- cgit v1.3-5-g45d5