On Mon, May 1, 2023 at 9:48 AM Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> wrote:
>
> On Sat, Apr 22 2023, Elijah Newren via GitGitGadget wrote:
>
> The "Subject" says "due to previous changes", but...
>
> > From: Elijah Newren <newren@xxxxxxxxx>
> >
> > Signed-off-by: Elijah Newren <newren@xxxxxxxxx>
> > ---
> > archive-zip.c | 2 +-
> > bundle-uri.c | 2 +-
> > color.c | 2 +-
> > combine-diff.c | 2 +-
> > common-main.c | 2 +-
> > config.c | 2 +-
> > copy.c | 2 +-
> > credential.c | 2 +-
> > daemon.c | 2 +-
> > date.c | 2 +-
> > diagnose.c | 2 +-
> > environment.c | 2 +-
> > ll-merge.c | 2 +-
> > match-trees.c | 2 +-
> > midx.c | 2 +-
> > object-file.c | 2 +-
> > packfile.c | 2 +-
> > pkt-line.c | 2 +-
> > range-diff.c | 2 +-
> > ref-filter.c | 2 +-
> > t/helper/test-match-trees.c | 1 -
> > t/helper/test-mergesort.c | 1 -
> > t/helper/test-oid-array.c | 1 -
> > t/helper/test-oidtree.c | 1 -
> > t/helper/test-parse-options.c | 1 -
> > t/helper/test-read-midx.c | 1 -
> > t/helper/test-string-list.c | 1 -
> > tree-diff.c | 2 +-
> > tree-walk.c | 2 +-
> > tree.c | 2 +-
> > wrapper.c | 3 ++-
> > 31 files changed, 25 insertions(+), 31 deletions(-)
> >
> > diff --git a/archive-zip.c b/archive-zip.c
> > index ef538a90df4..d0d065a312e 100644
> > --- a/archive-zip.c
> > +++ b/archive-zip.c
> > @@ -1,7 +1,7 @@
> > /*
> > * Copyright (c) 2006 Rene Scharfe
> > */
> > -#include "cache.h"
> > +#include "git-compat-util.h"
> > #include "config.h"
> > #include "archive.h"
> > #include "gettext.h"
>
> I tried making this change before this series was applied, and
> everything compiled...
Yeah, this actually could have been done as part of b7b189cd5ae
("treewide: reduce includes of cache.h in other headers", 2023-04-11),
which was from the series before this one.
> > diff --git a/bundle-uri.c b/bundle-uri.c
> > index 6d44662ee1f..ec1552bbca2 100644
> > --- a/bundle-uri.c
> > +++ b/bundle-uri.c
> > @@ -1,4 +1,4 @@
> > -#include "cache.h"
> > +#include "git-compat-util.h"
> > #include "bundle-uri.h"
> > #include "bundle.h"
> > #include "copy.h"
>
> That's not the case here, but this could instead be squashed into the
> 05/22 in this series, i.e. as soon as we add this copy.h, we don't need
> cache.h anymore.
>
> > diff --git a/color.c b/color.c
> > index f8a25ca807b..83abb11eda0 100644
> > --- a/color.c
> > +++ b/color.c
> > @@ -1,4 +1,4 @@
> > -#include "cache.h"
> > +#include "git-compat-util.h"
> > #include "config.h"
> > #include "color.h"
> > #include "editor.h"
>
> I did not look further, but all of the rest of these look like they'd be
> better off squashed into the respective "split this out" commit. I don't
> think keeping the "move declarations for ..." as "move-only" commits is
> worth it, as opposed to getting rid of this one, and making those
> atomic.
So, while that could be done, I found it harder to review my own
changes personally, and thought others would as well. If you're
looking through several dozen files for a single change (add one new
header), it's easy to fly through and be confident you didn't miss
anything, but when there are sometimes two changes (also replace
cache.h with git-compat-util.h, or just outright remove it if
git-compat-util.h is already included), then that slows review down
dramatically.
In the previous series, I addressed this by splitting each patch into
two -- (1) move declarations to new header and add new relevant
include, (2) remove the cache.h includes that was allowed by that
change. See patches 7-18 at
https://lore.kernel.org/git/pull.1509.git.1680361837.gitgitgadget@xxxxxxxxx/#r
.
But having half a dozen commits labelled "treewide: remove cache.h
inclusion due to header changes in previous patch", seemed like a bit
of a pain too. So I instead batched them up and did them all at once.
I could revert back to how I did it in the previous series, but I
think I'd want to keep the commits that are adding a new header
separate from the ones that remove includes of cache.h.
