git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Taylor Blau" <me@ttaylorr.com>,
	"Junio C Hamano" <gitster@pobox.com>,
	"Phillip Wood" <phillip.wood123@gmail.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 0/6] remove USE_THE_INDEX_COMPATIBILITY_MACROS
Date: Thu, 15 Dec 2022 10:58:59 +0100	[thread overview]
Message-ID: <cover-0.6-00000000000-20221215T095335Z-avarab@gmail.com> (raw)

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


             reply	other threads:[~2022-12-15  9:59 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-15  9:58 Ævar Arnfjörð Bjarmason [this message]
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 ` [PATCH v2 " Ævar Arnfjörð Bjarmason
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-0.6-00000000000-20221215T095335Z-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).