"Elijah Newren via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > diff --git a/trace2.c b/trace2.c > index 6dc74dff4c7..d4220af9ae1 100644 > --- a/trace2.c > +++ b/trace2.c > @@ -1,12 +1,8 @@ > #include "git-compat-util.h" > -#include "config.h" > -#include "json-writer.h" > -#include "quote.h" > #include "repository.h" > #include "run-command.h" > #include "sigchain.h" > #include "thread-utils.h" > -#include "version.h" > #include "trace.h" > #include "trace2.h" > #include "trace2/tr2_cfg.h" 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'. > diff --git a/t/helper/test-trace2.c b/t/helper/test-trace2.c > index d5ca0046c89..a0032ee3964 100644 > --- a/t/helper/test-trace2.c > +++ b/t/helper/test-trace2.c > @@ -2,7 +2,6 @@ > #include "strvec.h" > #include "run-command.h" > #include "exec-cmd.h" > -#include "config.h" > #include "repository.h" > #include "trace2.h" 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'. > diff --git a/t/helper/test-fast-rebase.c b/t/helper/test-fast-rebase.c > index cac20a72b3f..f9472c99143 100644 > --- a/t/helper/test-fast-rebase.c > +++ b/t/helper/test-fast-rebase.c > @@ -24,7 +24,6 @@ > #include "read-cache-ll.h" > #include "refs.h" > #include "revision.h" > -#include "sequencer.h" > #include "setup.h" > #include "strvec.h" > #include "tree.h" I'll register the following evil merge as the merge-fix/ for this topic. In addition, t/helper/test-fast-rebase.c that is touched by this step will simply disappear with the cc/git-replay topic, so it may not be a bad idea to exclude it from the patchset. Thanks. diff --git a/t/helper/test-trace2.c b/t/helper/test-trace2.c index 16089f04e1..55c06e4269 100644 --- a/t/helper/test-trace2.c +++ b/t/helper/test-trace2.c @@ -1,4 +1,5 @@ #include "test-tool.h" +#include "config-parse.h" #include "strvec.h" #include "run-command.h" #include "exec-cmd.h" diff --git a/trace2.c b/trace2.c index 4fa059199c..452428b09b 100644 --- a/trace2.c +++ b/trace2.c @@ -1,4 +1,5 @@ #include "git-compat-util.h" +#include "parse.h" #include "repository.h" #include "run-command.h" #include "sigchain.h"
