From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Phillip Wood" <phillip.wood123@gmail.com>,
"Taylor Blau" <me@ttaylorr.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH v2 0/6] remove USE_THE_INDEX_COMPATIBILITY_MACROS
Date: Fri, 10 Feb 2023 11:28:33 +0100 [thread overview]
Message-ID: <cover-v2-0.6-00000000000-20230210T102114Z-avarab@gmail.com> (raw)
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
next prev parent reply other threads:[~2023-02-10 10:29 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-15 9:58 [PATCH 0/6] remove USE_THE_INDEX_COMPATIBILITY_MACROS Ævar Arnfjörð Bjarmason
2022-12-15 9:59 ` [PATCH 1/6] builtin/rm.c: use narrower "USE_THE_INDEX_VARIABLE" Ævar Arnfjörð Bjarmason
2022-12-15 9:59 ` [PATCH 2/6] cocci & cache.h: fully apply "active_nr" part of index-compatibility Ævar Arnfjörð Bjarmason
2022-12-15 9:59 ` [PATCH 3/6] cocci & cache.h: apply pending "index_cache_pos" rule Ævar Arnfjörð Bjarmason
2022-12-15 9:59 ` [PATCH 4/6] cocci & cache-tree.h: migrate "write_cache_as_tree" to "*_index_*" Ævar Arnfjörð Bjarmason
2022-12-15 9:59 ` [PATCH 5/6] cache-tree API: remove redundant update_main_cache_tree() Ævar Arnfjörð Bjarmason
2022-12-15 9:59 ` [PATCH 6/6] cocci & cache.h: remove "USE_THE_INDEX_COMPATIBILITY_MACROS" Ævar Arnfjörð Bjarmason
2022-12-19 14:51 ` [PATCH 0/6] remove USE_THE_INDEX_COMPATIBILITY_MACROS Phillip Wood
2022-12-19 15:11 ` Ævar Arnfjörð Bjarmason
2022-12-19 20:42 ` Phillip Wood
2022-12-20 1:14 ` Junio C Hamano
2022-12-22 9:32 ` Ævar Arnfjörð Bjarmason
2023-02-10 10:28 ` Ævar Arnfjörð Bjarmason [this message]
2023-02-10 10:28 ` [PATCH v2 1/6] builtin/rm.c: use narrower "USE_THE_INDEX_VARIABLE" Ævar Arnfjörð Bjarmason
2023-02-10 19:29 ` Junio C Hamano
2023-02-10 10:28 ` [PATCH v2 2/6] cocci & cache.h: fully apply "active_nr" part of index-compatibility Ævar Arnfjörð Bjarmason
2023-02-10 10:28 ` [PATCH v2 3/6] cocci & cache.h: apply pending "index_cache_pos" rule Ævar Arnfjörð Bjarmason
2023-02-10 19:37 ` Junio C Hamano
2023-02-10 10:28 ` [PATCH v2 4/6] cocci & cache-tree.h: migrate "write_cache_as_tree" to "*_index_*" Ævar Arnfjörð Bjarmason
2023-02-10 10:28 ` [PATCH v2 5/6] cache-tree API: remove redundant update_main_cache_tree() Ævar Arnfjörð Bjarmason
2023-02-10 10:28 ` [PATCH v2 6/6] cocci & cache.h: remove "USE_THE_INDEX_COMPATIBILITY_MACROS" Ævar Arnfjörð Bjarmason
2023-02-10 19:42 ` Junio C Hamano
2023-02-10 19:12 ` [PATCH v2 0/6] remove USE_THE_INDEX_COMPATIBILITY_MACROS Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover-v2-0.6-00000000000-20230210T102114Z-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=me@ttaylorr.com \
--cc=phillip.wood123@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).