diff options
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2023-02-10 13:28:35 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-02-10 22:31:18 +0300 |
commit | cec13b9514868cf38b41330bbc3ea91a7961dd00 (patch) | |
tree | 0d7822fe61439ab7b9fa1a7abd945d90771f4a7a /cache.h | |
parent | 6193aaa9f91117922264ac577301d7df0e666131 (diff) |
cocci & cache.h: fully apply "active_nr" part of index-compatibility
Apply the "active_nr" part of "index-compatibility.pending.cocci",
which was left out in [1] due to an in-flight conflict. As of [2] the
topic we conflicted with has been merged to "master", so we can fully
apply this rule.
1. dc594180d9e (cocci & cache.h: apply variable section of "pending"
index-compatibility, 2022-11-19)
2. 9ea1378d046 (Merge branch 'ab/various-leak-fixes', 2022-12-14)
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 | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -454,8 +454,6 @@ extern struct index_state the_index; #ifndef USE_THE_INDEX_VARIABLE #ifdef USE_THE_INDEX_COMPATIBILITY_MACROS -#define active_nr (the_index.cache_nr) - #define read_cache() repo_read_index(the_repository) #define discard_cache() discard_index(&the_index) #define cache_name_pos(name, namelen) index_name_pos(&the_index,(name),(namelen)) |