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 84c8093c517ec06383c7e26f537e1b6bc0cd6a4c..10c19daec4ae7430ed7a252eadbb61fc6e0e10d3 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 a17024349797b93ea78c620605e16d9ee81cef32..dff215ac69339dce01cabd9a0f6d01b0e8bcec2f 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 4e6ed30afa1273f25aeca0a37b633bccca6a569c..8a3fd0009a042c67019a3e89e5727dc4b7240600 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 e5754b8da625f6231b0c70d73a0c5b05147a5a8c..d2b30d644da54c9da778a15960d3fecca9b927bc 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 5877188f3ad13c3890863504856bcae37b29650e..32d170ec303562416dd868724d714a947a4f0fb1 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 75ca1505a37c0cc8f02f2dbd86521fbd81454db9..0f3fbeec5325922a83e0d15382b940e6afddcb51 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 cce496944ac002c0371463a4e9b4b8303f6a7083..362bd64a4c21a632e27a53a4154355803400a9de 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 7c8de7b562a9d1dedfbfebb4032276a841d555cc..f30022d2225b0a81cb026a9ccc24366ebdb9d2b4 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 e21b0805f3c6f0e7572d915d6ce62add6d2b27fc..78965a6ebdc101f5753fb0e09b4ec1a4fc482378 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 8717b95e84fd85d9883f0e0031bc9aa625710f64..d1192c8c039b01bebdb099d7b43dd90989de0651 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 6774f6245f0f29de1a59f3d9f9660006d547824c..bafd2a5bf95b3e31cab6397d623329e835f5e0fc 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 f2df4334063f62199b6e7855495c1e0871ee029e..7750afb28661d421aec64a110f6406241e3af605 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 7d590ab72276efe914b3e0376b38815cfa3f3795..054cbcf5d83946b225774dc9da6b0ec1d112e79d 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 aaffd422d6e09a638b7515de0b2c9dc51939e286..d31f5e48ab58ee99ca44e27d9f3249aba68ef879 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 f18ca46dce40b720e12cc76e6360db1537feed1e..0e34581b209e8aeab1d1db8e948fff4ee40075dd 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 65a355cc590a1143d1ba7064d2c87d7fcb8d9056..c344f1694df28da085340b5f556ecae9bfcbb56f 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 0cd7ee12b7e51b1e3817114a5fe488cab4172f5c..680124a676087c65606ca6b750cd3f63c7cd44b0 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 7f0f04eab56a3bfb9257d3dc3d31d3948658e3a0..b5ee71c5ebda499899e5f64209611f0484359867 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"