treewide: remove cache.h inclusion due to setup.h changes

By moving several declarations to setup.h, the previous patch made it
possible to remove the include of cache.h in several source files.  Do
so.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/line-log.c b/line-log.c
index 84c8093..10c19da 100644 (file)
--- a/line-log.c
+++ b/line-log.c
@@ -1,7 +1,6 @@
 #include "git-compat-util.h"
 #include "alloc.h"
 #include "line-range.h"
-#include "cache.h"
 #include "hex.h"
 #include "tag.h"
 #include "blob.h"

diff --git a/path.c b/path.c
index a170243..dff215a 100644 (file)
--- a/path.c
+++ b/path.c
@@ -1,7 +1,7 @@
 /*
  * Utilities for paths and pathnames
  */
-#include "cache.h"
+#include "git-compat-util.h"
 #include "abspath.h"
 #include "environment.h"
 #include "gettext.h"

diff --git a/t/helper/test-advise.c b/t/helper/test-advise.c
index 4e6ed30..8a3fd00 100644 (file)
--- a/t/helper/test-advise.c
+++ b/t/helper/test-advise.c
@@ -1,5 +1,4 @@
 #include "test-tool.h"
-#include "cache.h"
 #include "advice.h"
 #include "config.h"
 #include "setup.h"

diff --git a/t/helper/test-bloom.c b/t/helper/test-bloom.c
index e5754b8..d2b30d6 100644 (file)
--- a/t/helper/test-bloom.c
+++ b/t/helper/test-bloom.c
@@ -1,7 +1,6 @@
-#include "cache.h"
+#include "test-tool.h"
 #include "bloom.h"
 #include "hex.h"
-#include "test-tool.h"
 #include "commit.h"
 #include "setup.h"
 

diff --git a/t/helper/test-config.c b/t/helper/test-config.c
index 5877188..32d170e 100644 (file)
--- a/t/helper/test-config.c
+++ b/t/helper/test-config.c
@@ -1,5 +1,4 @@
 #include "test-tool.h"
-#include "cache.h"
 #include "config.h"
 #include "setup.h"
 #include "string-list.h"

diff --git a/t/helper/test-pack-mtimes.c b/t/helper/test-pack-mtimes.c
index 75ca150..0f3fbee 100644 (file)
--- a/t/helper/test-pack-mtimes.c
+++ b/t/helper/test-pack-mtimes.c
@@ -1,5 +1,4 @@
 #include "test-tool.h"
-#include "cache.h"
 #include "hex.h"
 #include "strbuf.h"
 #include "object-store.h"

diff --git a/t/helper/test-partial-clone.c b/t/helper/test-partial-clone.c
index cce4969..362bd64 100644 (file)
--- a/t/helper/test-partial-clone.c
+++ b/t/helper/test-partial-clone.c
@@ -1,6 +1,5 @@
-#include "cache.h"
-#include "hex.h"
 #include "test-tool.h"
+#include "hex.h"
 #include "repository.h"
 #include "object-store.h"
 #include "setup.h"

diff --git a/t/helper/test-proc-receive.c b/t/helper/test-proc-receive.c
index 7c8de7b..f30022d 100644 (file)
--- a/t/helper/test-proc-receive.c
+++ b/t/helper/test-proc-receive.c
@@ -1,11 +1,10 @@
-#include "cache.h"
+#include "test-tool.h"
 #include "connect.h"
 #include "hex.h"
 #include "parse-options.h"
 #include "pkt-line.h"
 #include "setup.h"
 #include "sigchain.h"
-#include "test-tool.h"
 
 static const char *proc_receive_usage[] = {
        "test-tool proc-receive [<options>]",

diff --git a/t/helper/test-read-graph.c b/t/helper/test-read-graph.c
index e21b080..78965a6 100644 (file)
--- a/t/helper/test-read-graph.c
+++ b/t/helper/test-read-graph.c
@@ -1,5 +1,4 @@
 #include "test-tool.h"
-#include "cache.h"
 #include "commit-graph.h"
 #include "repository.h"
 #include "object-store.h"

diff --git a/t/helper/test-ref-store.c b/t/helper/test-ref-store.c
index 8717b95..d1192c8 100644 (file)
--- a/t/helper/test-ref-store.c
+++ b/t/helper/test-ref-store.c
@@ -1,5 +1,4 @@
 #include "test-tool.h"
-#include "cache.h"
 #include "hex.h"
 #include "refs.h"
 #include "setup.h"

diff --git a/t/helper/test-repository.c b/t/helper/test-repository.c
index 6774f62..bafd2a5 100644 (file)
--- a/t/helper/test-repository.c
+++ b/t/helper/test-repository.c
@@ -1,5 +1,4 @@
 #include "test-tool.h"
-#include "cache.h"
 #include "commit-graph.h"
 #include "commit.h"
 #include "config.h"

diff --git a/t/helper/test-revision-walking.c b/t/helper/test-revision-walking.c
index f2df433..7750afb 100644 (file)
--- a/t/helper/test-revision-walking.c
+++ b/t/helper/test-revision-walking.c
@@ -9,7 +9,6 @@
  */
 
 #include "test-tool.h"
-#include "cache.h"
 #include "commit.h"
 #include "diff.h"
 #include "revision.h"

diff --git a/t/helper/test-serve-v2.c b/t/helper/test-serve-v2.c
index 7d590ab..054cbcf 100644 (file)
--- a/t/helper/test-serve-v2.c
+++ b/t/helper/test-serve-v2.c
@@ -1,5 +1,4 @@
 #include "test-tool.h"
-#include "cache.h"
 #include "gettext.h"
 #include "parse-options.h"
 #include "serve.h"

diff --git a/t/helper/test-submodule-nested-repo-config.c b/t/helper/test-submodule-nested-repo-config.c
index aaffd42..d31f5e4 100644 (file)
--- a/t/helper/test-submodule-nested-repo-config.c
+++ b/t/helper/test-submodule-nested-repo-config.c
@@ -1,5 +1,4 @@
 #include "test-tool.h"
-#include "cache.h"
 #include "setup.h"
 #include "submodule-config.h"
 

diff --git a/t/helper/test-submodule.c b/t/helper/test-submodule.c
index f18ca46..0e34581 100644 (file)
--- a/t/helper/test-submodule.c
+++ b/t/helper/test-submodule.c
@@ -1,6 +1,5 @@
 #include "test-tool.h"
 #include "test-tool-utils.h"
-#include "cache.h"
 #include "parse-options.h"
 #include "remote.h"
 #include "setup.h"

diff --git a/t/helper/test-subprocess.c b/t/helper/test-subprocess.c
index 65a355c..c344f16 100644 (file)
--- a/t/helper/test-subprocess.c
+++ b/t/helper/test-subprocess.c
@@ -1,5 +1,4 @@
 #include "test-tool.h"
-#include "cache.h"
 #include "run-command.h"
 #include "setup.h"
 

diff --git a/t/helper/test-userdiff.c b/t/helper/test-userdiff.c
index 0cd7ee1..680124a 100644 (file)
--- a/t/helper/test-userdiff.c
+++ b/t/helper/test-userdiff.c
@@ -1,5 +1,4 @@
 #include "test-tool.h"
-#include "cache.h"
 #include "setup.h"
 #include "userdiff.h"
 #include "config.h"

diff --git a/worktree.c b/worktree.c
index 7f0f04e..b5ee71c 100644 (file)
--- a/worktree.c
+++ b/worktree.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "abspath.h"
 #include "alloc.h"
 #include "environment.h"