Hi Ævar On 15/12/2022 09:58, Ævar Arnfjörð Bjarmason wrote:
My recent now-landed topic[1] to remove most use of "USE_THE_INDEX_COMPATIBILITY_MACROS" was merged in 041df69edd3 (Merge branch 'ab/fewer-the-index-macros', 2022-11-28). It left out use of the macros that would have conflicted with in-flight changes, but as those topics have landed we can now complete the migration. As before this is almost entirely a matter of applying the existing "pending" coccinelle rules, the exceptions being 1/6, and the *.h changes where we remove the macro definitions (the macro users being edited by coccinelle). The 4-5/6 then handle some edge cases we had left (but the code change itself is done by coccinelle).
I've only given these patches a quick scan, but I think they look good. None of the callers that are converted here are in library code so using the_index makes perfect sense.
Best Wishes Phillip
1. https://lore.kernel.org/git/cover-v2-00.11-00000000000-20221119T125550Z-avarab@xxxxxxxxx/ Ævar Arnfjörð Bjarmason (6): builtin/rm.c: use narrower "USE_THE_INDEX_VARIABLE" cocci & cache.h: fully apply "active_nr" part of index-compatibility cocci & cache.h: apply pending "index_cache_pos" rule cocci & cache-tree.h: migrate "write_cache_as_tree" to "*_index_*" cache-tree API: remove redundant update_main_cache_tree() cocci & cache.h: remove "USE_THE_INDEX_COMPATIBILITY_MACROS" builtin/am.c | 6 ++-- builtin/commit.c | 18 +++++----- builtin/merge.c | 8 ++--- builtin/mv.c | 8 +++-- builtin/rm.c | 2 +- builtin/stash.c | 11 +++--- builtin/update-index.c | 4 +-- builtin/write-tree.c | 5 +-- cache-tree.h | 15 -------- cache.h | 12 +------ contrib/coccinelle/index-compatibility.cocci | 36 ++++++++++++++----- .../index-compatibility.pending.cocci | 24 ------------- 12 files changed, 62 insertions(+), 87 deletions(-) delete mode 100644 contrib/coccinelle/index-compatibility.pending.cocci
