[PATCH v2 16/16] csum-file.h: remove unnecessary inclusion of cache.h
From: Elijah Newren via GitGitGadget <hidden>
Date: 2023-03-21 06:27:02
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Elijah Newren <redacted> With the change in the last commit to move several functions to write-or-die.h, csum-file.h no longer needs to include cache.h. However, removing that include forces several other C files, which directly or indirectly dependend upon csum-file.h's inclusion of cache.h, to now be more explicit about their dependencies. Signed-off-by: Elijah Newren <redacted> --- bulk-checkin.c | 2 +- chunk-format.c | 1 + commit-graph.c | 2 +- csum-file.h | 1 - delta-islands.c | 2 +- fetch-pack.c | 2 +- midx.c | 2 +- object-file.c | 2 +- pack-bitmap-write.c | 3 ++- pack-bitmap.c | 2 +- pack.h | 2 ++ packfile.c | 2 +- 12 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/bulk-checkin.c b/bulk-checkin.c
index eb6d7a2805b..d2428b86111 100644
--- a/bulk-checkin.c
+++ b/bulk-checkin.c@@ -1,7 +1,7 @@ /* * Copyright (c) 2011, Google Inc. */ -#include "git-compat-util.h" +#include "cache.h" #include "alloc.h" #include "bulk-checkin.h" #include "environment.h"
diff --git a/chunk-format.c b/chunk-format.c
index 6d1071729df..60a73c1b140 100644
--- a/chunk-format.c
+++ b/chunk-format.c@@ -3,6 +3,7 @@ #include "chunk-format.h" #include "csum-file.h" #include "gettext.h" +#include "trace2.h" /* * When writing a chunk-based file format, collect the chunks in
diff --git a/commit-graph.c b/commit-graph.c
index 5481736c76c..f0cd2e7a2a3 100644
--- a/commit-graph.c
+++ b/commit-graph.c@@ -1,4 +1,4 @@ -#include "git-compat-util.h" +#include "cache.h" #include "config.h" #include "gettext.h" #include "hex.h"
diff --git a/csum-file.h b/csum-file.h
index 4cd9014e367..566e05cbd25 100644
--- a/csum-file.h
+++ b/csum-file.h@@ -1,7 +1,6 @@ #ifndef CSUM_FILE_H #define CSUM_FILE_H -#include "cache.h" #include "hash.h" #include "write-or-die.h"
diff --git a/delta-islands.c b/delta-islands.c
index 1222b6a6cd1..73a01179e83 100644
--- a/delta-islands.c
+++ b/delta-islands.c@@ -1,4 +1,4 @@ -#include "git-compat-util.h" +#include "cache.h" #include "alloc.h" #include "attr.h" #include "object.h"
diff --git a/fetch-pack.c b/fetch-pack.c
index c453a4168f9..10f759532ce 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c@@ -1,4 +1,4 @@ -#include "git-compat-util.h" +#include "cache.h" #include "alloc.h" #include "repository.h" #include "config.h"
diff --git a/midx.c b/midx.c
index b111665dcab..9af3e5de889 100644
--- a/midx.c
+++ b/midx.c@@ -1,4 +1,4 @@ -#include "git-compat-util.h" +#include "cache.h" #include "abspath.h" #include "alloc.h" #include "config.h"
diff --git a/object-file.c b/object-file.c
index 05fff230f73..397596e3c8f 100644
--- a/object-file.c
+++ b/object-file.c@@ -6,7 +6,7 @@ * This handles basic git object files - packing, unpacking, * creation etc. */ -#include "git-compat-util.h" +#include "cache.h" #include "abspath.h" #include "alloc.h" #include "config.h"
diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
index 63f16080c9b..0fddeb1298b 100644
--- a/pack-bitmap-write.c
+++ b/pack-bitmap-write.c@@ -1,4 +1,4 @@ -#include "git-compat-util.h" +#include "cache.h" #include "alloc.h" #include "environment.h" #include "gettext.h"
@@ -17,6 +17,7 @@ #include "pack-objects.h" #include "commit-reach.h" #include "prio-queue.h" +#include "trace2.h" struct bitmapped_commit { struct commit *commit;
diff --git a/pack-bitmap.c b/pack-bitmap.c
index 241ac9166c1..23d87e71bd9 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c@@ -1,4 +1,4 @@ -#include "git-compat-util.h" +#include "cache.h" #include "alloc.h" #include "commit.h" #include "gettext.h"
diff --git a/pack.h b/pack.h
index 01d385903ad..3ab9e3f60c0 100644
--- a/pack.h
+++ b/pack.h@@ -4,6 +4,8 @@ #include "object.h" #include "csum-file.h" +struct packed_git; +struct pack_window; struct repository; /*
diff --git a/packfile.c b/packfile.c
index 4b5b841d046..61672d50bdf 100644
--- a/packfile.c
+++ b/packfile.c@@ -1,4 +1,4 @@ -#include "git-compat-util.h" +#include "cache.h" #include "alloc.h" #include "environment.h" #include "gettext.h"
--
gitgitgadget