Re: [PATCH 02/12] treewide: remove unnecessary includes in source files

git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed

From: Junio C Hamano <gitster@pobox.com>
To: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org,  Elijah Newren <newren@gmail.com>
Subject: Re: [PATCH 02/12] treewide: remove unnecessary includes in source files
Date: Sun, 03 Dec 2023 22:15:05 +0900	[thread overview]
Message-ID: <xmqq1qc35sx2.fsf@gitster.g> (raw)
In-Reply-To: <dbfb108214d71ab29c29230eed3c4d40fe4b42b7.1701585682.git.gitgitgadget@gmail.com> (Elijah Newren via GitGitGadget's message of "Sun, 03 Dec 2023 06:41:11 +0000")

"Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> 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"

next prev parent reply	other threads:[~2023-12-03 13:15 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-03  6:41 [PATCH 00/12] Additional header cleanups (removing unnecessary includes) Elijah Newren via GitGitGadget
2023-12-03  6:41 ` [PATCH 01/12] treewide: remove unnecessary includes from header files Elijah Newren via GitGitGadget
2023-12-03  6:41 ` [PATCH 02/12] treewide: remove unnecessary includes in source files Elijah Newren via GitGitGadget
2023-12-03 13:15   ` Junio C Hamano [this message]
2023-12-20 19:34     ` Junio C Hamano
2023-12-20 20:42       ` Elijah Newren
2023-12-03  6:41 ` [PATCH 03/12] archive.h: remove unnecessary include Elijah Newren via GitGitGadget
2023-12-03  6:41 ` [PATCH 04/12] blame.h: remove unnecessary includes Elijah Newren via GitGitGadget
2023-12-03  6:41 ` [PATCH 05/12] fsmonitor--daemon.h: " Elijah Newren via GitGitGadget
2023-12-03  6:41 ` [PATCH 06/12] http.h: remove unnecessary include Elijah Newren via GitGitGadget
2023-12-03  6:41 ` [PATCH 07/12] line-log.h: " Elijah Newren via GitGitGadget
2023-12-03  6:41 ` [PATCH 08/12] pkt-line.h: " Elijah Newren via GitGitGadget
2023-12-03  6:41 ` [PATCH 09/12] submodule-config.h: " Elijah Newren via GitGitGadget
2023-12-03  6:41 ` [PATCH 10/12] trace2/tr2_tls.h: " Elijah Newren via GitGitGadget
2023-12-03  6:41 ` [PATCH 11/12] treewide: add direct includes currently only pulled in transitively Elijah Newren via GitGitGadget
2023-12-03  6:41 ` [PATCH 12/12] treewide: remove unnecessary includes in source files Elijah Newren via GitGitGadget
2023-12-23 17:14 ` [PATCH v2 00/12] Additional header cleanups (removing unnecessary includes) Elijah Newren via GitGitGadget
2023-12-23 17:14   ` [PATCH v2 01/12] treewide: remove unnecessary includes from header files Elijah Newren via GitGitGadget
2023-12-23 17:14   ` [PATCH v2 02/12] treewide: remove unnecessary includes in source files Elijah Newren via GitGitGadget
2023-12-23 17:14   ` [PATCH v2 03/12] archive.h: remove unnecessary include Elijah Newren via GitGitGadget
2023-12-23 17:14   ` [PATCH v2 04/12] blame.h: remove unnecessary includes Elijah Newren via GitGitGadget
2023-12-23 17:14   ` [PATCH v2 05/12] fsmonitor--daemon.h: " Elijah Newren via GitGitGadget
2023-12-23 17:14   ` [PATCH v2 06/12] http.h: remove unnecessary include Elijah Newren via GitGitGadget
2023-12-23 17:14   ` [PATCH v2 07/12] line-log.h: " Elijah Newren via GitGitGadget
2023-12-23 17:14   ` [PATCH v2 08/12] pkt-line.h: " Elijah Newren via GitGitGadget
2023-12-23 17:14   ` [PATCH v2 09/12] submodule-config.h: " Elijah Newren via GitGitGadget
2023-12-23 17:14   ` [PATCH v2 10/12] trace2/tr2_tls.h: " Elijah Newren via GitGitGadget
2023-12-23 17:14   ` [PATCH v2 11/12] treewide: add direct includes currently only pulled in transitively Elijah Newren via GitGitGadget
2023-12-23 17:15   ` [PATCH v2 12/12] treewide: remove unnecessary includes in source files Elijah Newren via GitGitGadget

find likely ancestor, descendant, or conflicting patches for this message:
dfblob:16089f04e dfblob:4fa059199 dfblob:55c06e426 dfblob:452428b09
	(help)

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=xmqq1qc35sx2.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=newren@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).