diff options
| author | Elijah Newren <newren@gmail.com> | 2023-05-16 09:33:55 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-06-21 23:39:53 +0300 |
| commit | bc47f16db2bccb0398edd93af27086f35a3cb97a (patch) | |
| tree | 832c2d5646016f16d27b0e78238b2f8918d04869 | |
| parent | 750324ddb876b54f52578df26278bf99c1e51eb9 (diff) | |
repository.h: move declaration of the_index from cache.h
the_index is a global variable defined in repository.c; as such, its
declaration feels better suited living in repository.h rather than
cache.h. Move it.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | cache.h | 4 | ||||
| -rw-r--r-- | repository.h | 3 | ||||
| -rw-r--r-- | t/helper/test-dump-split-index.c | 1 |
3 files changed, 4 insertions, 4 deletions
@@ -312,10 +312,6 @@ typedef int (*must_prefetch_predicate)(const struct cache_entry *); void prefetch_cache_entries(const struct index_state *istate, must_prefetch_predicate must_prefetch); -#ifdef USE_THE_INDEX_VARIABLE -extern struct index_state the_index; -#endif - /* Initialize and use the cache information */ struct lock_file; int do_read_index(struct index_state *istate, const char *path, diff --git a/repository.h b/repository.h index 655a95026d..1cb314721c 100644 --- a/repository.h +++ b/repository.h @@ -170,6 +170,9 @@ struct repository { }; extern struct repository *the_repository; +#ifdef USE_THE_INDEX_VARIABLE +extern struct index_state the_index; +#endif /* * Define a custom repository layout. Any field can be NULL, which diff --git a/t/helper/test-dump-split-index.c b/t/helper/test-dump-split-index.c index d1badd7112..63fde9157c 100644 --- a/t/helper/test-dump-split-index.c +++ b/t/helper/test-dump-split-index.c @@ -2,6 +2,7 @@ #include "test-tool.h" #include "cache.h" #include "hex.h" +#include "repository.h" #include "setup.h" #include "split-index.h" #include "ewah/ewok.h" |