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

[PATCH v2 0/6] remove USE_THE_INDEX_COMPATIBILITY_MACROS

From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date
Feb 10, 2023, 10:28 UTC
Message-ID
<cover-v2-0.6-00000000000-20230210T102114Z-avarab@gmail.com>
In-Reply-To
<cover-0.6-00000000000-20221215T095335Z-avarab@gmail.com>

Most of our use of these compatibility macros went away with 041df69edd3 (Merge branch 'ab/fewer-the-index-macros', 2022-11-28) , which was part of v2.39.0.

That topic left out these stragglers, as some of this would have conflicted with in-flight topics, and I'd skipped the cache-tree.h cases altogether.

The update in v2 is trivial, just to rebase the series for changes on "master". There are no semantic or textual conflicts with "seen" either, so finishing this migration before we get another user of them would be nice.

The v1 had a side discussion that didn't need resolving here. The question was what a series like this might do if we needed to convert library code to make new use of "the_index" (as opposed to converting the functions themselves to take it from their callers).

That's an interesting question, but irrelevant to this topic, as there's no such library users to deal with, and this migration closes the door on that hypothetical question needing to be addressed in the future.

Æ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
Range-diff against v1:
1:  3517389f732 = 1:  916761cb50f builtin/rm.c: use narrower "USE_THE_INDEX_VARIABLE"
2:  03c6e404367 = 2:  6040edad622 cocci & cache.h: fully apply "active_nr" part of index-compatibility
3:  2dbe4f45363 = 3:  3e9d97dbff2 cocci & cache.h: apply pending "index_cache_pos" rule
4:  679ddc857c1 ! 4:  e36a0ae562f cocci & cache-tree.h: migrate "write_cache_as_tree" to "*_index_*"
    @@ builtin/am.c
      #include "config.h"
      #include "builtin.h"
     @@ builtin/am.c: static void do_commit(const struct am_state *state)
    - 	if (run_hooks("pre-applypatch"))
    + 	if (!state->no_verify && run_hooks("pre-applypatch"))
      		exit(1);
      
     -	if (write_cache_as_tree(&tree, 0, NULL))
5:  7f956fd8b75 = 5:  ab8794da29c cache-tree API: remove redundant update_main_cache_tree()
6:  4807a3fe8ff = 6:  77c30cfe455 cocci & cache.h: remove "USE_THE_INDEX_COMPATIBILITY_MACROS"
-- 
2.39.1.1475.gc2542cdc5ef
Previous: Ævar Arnfjörð BjarmasonNext: Ævar Arnfjörð Bjarmason
Message 13 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.