aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2023-02-10 11:28:36 +0100
committerJunio C Hamano <gitster@pobox.com>2023-02-10 11:37:27 -0800
commitbabed893f52a44771dd9d85329ee3bd64438adfb (patch)
treedd65e1b4f1e4ddf75040e7746fca003c162bbca4 /contrib
parentcec13b9514868cf38b41330bbc3ea91a7961dd00 (diff)
downloadgit-babed893f52a44771dd9d85329ee3bd64438adfb.tar.xz
cocci & cache.h: apply pending "index_cache_pos" rule
Apply the rule added in [1] to change "cache_name_pos" to "index_name_pos", which allows us to get rid of another "USE_THE_INDEX_COMPATIBILITY_MACROS" macro. The replacement of "USE_THE_INDEX_COMPATIBILITY_MACROS" here with "USE_THE_INDEX_VARIABLE" is a manual change on top, now that these files only use "&the_index", and don't need any compatibility macros (or functions). 1. 0e6550a2c63 (cocci: add a index-compatibility.pending.cocci, 2022-11-19) Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/coccinelle/index-compatibility.cocci3
-rw-r--r--contrib/coccinelle/index-compatibility.pending.cocci3
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/coccinelle/index-compatibility.cocci b/contrib/coccinelle/index-compatibility.cocci
index 028ff53354..1d37546fdb 100644
--- a/contrib/coccinelle/index-compatibility.cocci
+++ b/contrib/coccinelle/index-compatibility.cocci
@@ -91,6 +91,9 @@ identifier ACT = active_cache_tree;
|
- resolve_undo_clear
+ resolve_undo_clear_index
+|
+- cache_name_pos
++ index_name_pos
)
(
+ &the_index,
diff --git a/contrib/coccinelle/index-compatibility.pending.cocci b/contrib/coccinelle/index-compatibility.pending.cocci
index 01f875d006..ecf3b45dec 100644
--- a/contrib/coccinelle/index-compatibility.pending.cocci
+++ b/contrib/coccinelle/index-compatibility.pending.cocci
@@ -15,9 +15,6 @@
(
- discard_cache
+ discard_index
-|
-- cache_name_pos
-+ index_name_pos
)
(
+ &the_index,