On Wed, Dec 20, 2023 at 11:34 AM Junio C Hamano [off-list ref] wrote:

Junio C Hamano [off-list ref] writes:

quoted

"Elijah Newren via GitGitGadget" [off-list ref] writes:

quoted

diff --git a/trace2.c b/trace2.c
index 6dc74dff4c7..d4220af9ae1 100644
--- a/trace2.c

...

An in-flight topic seem to want to see git_env_bool() that is
declared in parse.h that is pulled in via inclusion of config.h
hence this hunk breaks 'seen'.

quoted

diff --git a/t/helper/test-trace2.c b/t/helper/test-trace2.c
index d5ca0046c89..a0032ee3964 100644
--- a/t/helper/test-trace2.c

...

An in-flight topic starts using "struct key_value_info" that is
available via the inclusion of "config.h", hence this hunk breaks
the build of 'seen'.

It seems that we have gained another topic in flight that gets
broken by this change.  I can keep piling merge-fixes on top, but it
does not look like a strategy that would scale well.

Can we get this series thoroughly reviewed quickly to merge it down
via 'next' to 'master' soonish, so that other topics can be rebased
on the result, or is that too much to ask during the Winter lull?

Thanks.

The Winter lull is my winter surge, so I can certainly quickly make
whatever changes are required (well, assuming I can shake this
fever...).  But that doesn't help much with reviewing, since that
should be done by someone other than the author.  However, these
particular type of changes are pretty innocuous; there's really not
anything clever going on, it's just a lot of gruntwork, and
does-it-compile is most of the review.

Anyway, I'll reroll, dropping or holding back any changes that
conflict with next or seen, and see if that encourages anyone to chime
in.