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/pull.c | |
| parent | 319ba144076c27f3451bb73834839e9441a9c180 (diff) | |
| download | git-f59aa5e0a93242f73bf21e241fabe0c261f4b62a.tar.xz | |
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/pull.c')
| -rw-r--r-- | builtin/pull.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) |