diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-11-19 16:07:34 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-11-21 06:06:15 +0300 |
| commit | dc594180d9e62438cb664c678f5e5bd229154c75 (patch) | |
| tree | 10b94b968ae39d1f78cdac0fdaa3238f744f5c41 /cache.h | |
| parent | 031b2033e0b5c6276bbd93f276e1698f925fb498 (diff) | |
cocci & cache.h: apply variable section of "pending" index-compatibility
Mostly apply the part of "index-compatibility.pending.cocci" that
renames the global variables like "active_nr", which are a shorthand
to referencing (in that case) a struct member as "the_index.cache_nr".
In doing so move more of "index-compatibility.pending.cocci" to
"index-compatibility.cocci".
In the case of "active_nr" we'd have a textual conflict with
"ab/various-leak-fixes" in "next"[1]. Let's exclude that specific case
while moving the rule over from "pending".
1. 407b94280f8 (commit: discard partial cache before (re-)reading it,
2022-11-08)
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -436,10 +436,7 @@ void prefetch_cache_entries(const struct index_state *istate, #ifdef USE_THE_INDEX_COMPATIBILITY_MACROS extern struct index_state the_index; -#define active_cache (the_index.cache) #define active_nr (the_index.cache_nr) -#define active_cache_changed (the_index.cache_changed) -#define active_cache_tree (the_index.cache_tree) #define read_cache() repo_read_index(the_repository) #define read_cache_from(path) read_index_from(&the_index, (path), (get_git_dir())) |