git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 0/6] remove USE_THE_INDEX_COMPATIBILITY_MACROS

From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date
Dec 15, 2022, 09:58 UTC
Message-ID
<cover-0.6-00000000000-20221215T095335Z-avarab@gmail.com>

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).

1. https://lore.kernel.org/git/cover-v2-00.11-00000000000-20221119T125550Z-avarab@gmail.com/
Æ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
-- 
2.39.0.rc2.1048.g0e5493b8d5b
Next: Ævar Arnfjörð Bjarmason
Message 1 of 23 in “remove USE_THE_INDEX_COMPATIBILITY_MACROS”
  1. 0/6 remove USE_THE_INDEX_COMPATIBILITY_MACROSÆvar Arnfjörð Bjarmason, Dec 15, 2022
  2. 1/6 builtin/rm.c: use narrower "USE_THE_INDEX_VARIABLE"Ævar Arnfjörð Bjarmason, Dec 15, 2022
  3. 2/6 cocci & cache.h: fully apply "active_nr" part of index-compatibilityÆvar Arnfjörð Bjarmason, Dec 15, 2022
  4. 3/6 cocci & cache.h: apply pending "index_cache_pos" ruleÆvar Arnfjörð Bjarmason, Dec 15, 2022
  5. 4/6 cocci & cache-tree.h: migrate "write_cache_as_tree" to "*_index_*"Ævar Arnfjörð Bjarmason, Dec 15, 2022
  6. 5/6 cache-tree API: remove redundant update_main_cache_tree()Ævar Arnfjörð Bjarmason, Dec 15, 2022
  7. 6/6 cocci & cache.h: remove "USE_THE_INDEX_COMPATIBILITY_MACROS"Ævar Arnfjörð Bjarmason, Dec 15, 2022
  8. Phillip WoodDec 19, 2022
  9. Ævar Arnfjörð BjarmasonDec 19, 2022
  10. Phillip WoodDec 19, 2022
  11. Junio C HamanoDec 20, 2022
  12. Ævar Arnfjörð BjarmasonDec 22, 2022
  13. 0/6 remove USE_THE_INDEX_COMPATIBILITY_MACROSÆvar Arnfjörð Bjarmason, Feb 10, 2023
  14. 1/6 builtin/rm.c: use narrower "USE_THE_INDEX_VARIABLE"Ævar Arnfjörð Bjarmason, Feb 10, 2023
  15. Junio C HamanoFeb 10, 2023
  16. 2/6 cocci & cache.h: fully apply "active_nr" part of index-compatibilityÆvar Arnfjörð Bjarmason, Feb 10, 2023
  17. 3/6 cocci & cache.h: apply pending "index_cache_pos" ruleÆvar Arnfjörð Bjarmason, Feb 10, 2023
  18. Junio C HamanoFeb 10, 2023
  19. 4/6 cocci & cache-tree.h: migrate "write_cache_as_tree" to "*_index_*"Ævar Arnfjörð Bjarmason, Feb 10, 2023
  20. 5/6 cache-tree API: remove redundant update_main_cache_tree()Ævar Arnfjörð Bjarmason, Feb 10, 2023
  21. 6/6 cocci & cache.h: remove "USE_THE_INDEX_COMPATIBILITY_MACROS"Ævar Arnfjörð Bjarmason, Feb 10, 2023
  22. Junio C HamanoFeb 10, 2023
  23. Junio C HamanoFeb 10, 2023

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.