From a64acf7298e87740a596123d2b39fefe623fd46f Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Tue, 21 Mar 2023 06:26:02 +0000 Subject: treewide: remove unnecessary includes of cache.h The last several commits were geared at replacing the include of cache.h in strbuf.c with an include of git-compat-util.h. Unfortunately, I had to drop a patch moving some functions from cache.h to object-name.h, due to excessive conflicts with other in-flight topics. However, even without that patch, the series of patches so far allows us to modify a number of C files to replace an include of cache.h with git-compat-util.h. Do that to reduce our dependencies. (If we could have kept our object-name.h patch in this series, it would have also let us reduce the includes in checkout.c and fmt-merge-msg.c in addition to strbuf.c). Just to ensure that nothing else was bringing in cache.h, all of the affected files have been checked to ensure that gcc -E -I. $SOURCE_FILE | grep '"cache.h"' found no hits and that make DEVELOPER=1 ${OBJECT_FILE_FOR_SOURCE_FILE} successfully compiles without warnings. Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- trace2/tr2_cfg.c | 4 +++- trace2/tr2_cmd_name.c | 3 ++- trace2/tr2_dst.c | 3 ++- trace2/tr2_sid.c | 3 ++- 4 files changed, 9 insertions(+), 4 deletions(-) (limited to 'trace2') diff --git a/trace2/tr2_cfg.c b/trace2/tr2_cfg.c index ec9ac1a6ef..78cfc15d52 100644 --- a/trace2/tr2_cfg.c +++ b/trace2/tr2_cfg.c @@ -1,5 +1,7 @@ -#include "cache.h" +#include "git-compat-util.h" #include "config.h" +#include "strbuf.h" +#include "trace2.h" #include "trace2/tr2_cfg.h" #include "trace2/tr2_sysenv.h" diff --git a/trace2/tr2_cmd_name.c b/trace2/tr2_cmd_name.c index dd313204f5..b7b5a869b7 100644 --- a/trace2/tr2_cmd_name.c +++ b/trace2/tr2_cmd_name.c @@ -1,4 +1,5 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "strbuf.h" #include "trace2/tr2_cmd_name.h" #define TR2_ENVVAR_PARENT_NAME "GIT_TRACE2_PARENT_NAME" diff --git a/trace2/tr2_dst.c b/trace2/tr2_dst.c index 273260e1f1..5be892cd5c 100644 --- a/trace2/tr2_dst.c +++ b/trace2/tr2_dst.c @@ -1,6 +1,7 @@ -#include "cache.h" +#include "git-compat-util.h" #include "abspath.h" #include "sigchain.h" +#include "strbuf.h" #include "trace2/tr2_dst.h" #include "trace2/tr2_sid.h" #include "trace2/tr2_sysenv.h" diff --git a/trace2/tr2_sid.c b/trace2/tr2_sid.c index 5f1ce6f85c..09c4ef0d17 100644 --- a/trace2/tr2_sid.c +++ b/trace2/tr2_sid.c @@ -1,5 +1,6 @@ -#include "cache.h" +#include "git-compat-util.h" #include "hex.h" +#include "strbuf.h" #include "trace2/tr2_tbuf.h" #include "trace2/tr2_sid.h" -- cgit v1.3