treewide: remove unnecessary cache.h inclusion

Several files were including cache.h solely to get other headers, such
as trace.h and trace2.h.  Since the last few commits have modified
files to make these dependencies more explicit, the inclusion of cache.h
is no longer needed in several cases.  Remove it.

Signed-off-by: Elijah Newren <newren@gmail.com>
Acked-by: Calvin Wan <calvinwan@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/compat/simple-ipc/ipc-unix-socket.c b/compat/simple-ipc/ipc-unix-socket.c
index 7064475b39f3376e16d123a4bcb6d861c0ee80c6..b2f4f22ce44f51f6f8f18e0d7ca6a2ed22de183b 100644 (file)
--- a/compat/simple-ipc/ipc-unix-socket.c
+++ b/compat/simple-ipc/ipc-unix-socket.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "gettext.h"
 #include "simple-ipc.h"
 #include "strbuf.h"

diff --git a/connect.c b/connect.c
index 929f72ec5d7b62b52752e16507f2955b97f70371..5d8036197d52c5c92145224f73ea6b9adabd1c33 100644 (file)
--- a/connect.c
+++ b/connect.c
@@ -1,5 +1,4 @@
 #include "git-compat-util.h"
-#include "cache.h"
 #include "config.h"
 #include "environment.h"
 #include "gettext.h"

diff --git a/fetch-pack.c b/fetch-pack.c
index 7d4f190fb1d9335db121f8dfbf60e46ff284da7a..677102465a12c3c2fa4ab7f5a40b4b28c3cc5afd 100644 (file)
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "alloc.h"
 #include "repository.h"
 #include "config.h"

diff --git a/pack-write.c b/pack-write.c
index 152c14aa7aaf644399f38c3c3710a7f7552d3b6e..d9b460fab4c858a5c848e781edeaf982c37b6528 100644 (file)
--- a/pack-write.c
+++ b/pack-write.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "environment.h"
 #include "gettext.h"
 #include "hex.h"

diff --git a/promisor-remote.c b/promisor-remote.c
index 9d83d2f4b9cfff754ddcdee29e3496e707325404..1adcd6fb0a51a0abc5c93a1fe3fc26dc51d60ab8 100644 (file)
--- a/promisor-remote.c
+++ b/promisor-remote.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "gettext.h"
 #include "hex.h"
 #include "object-store.h"

diff --git a/protocol.c b/protocol.c
index 4d8eb887e824a8452016135267067c30719799c8..079ba75acf4e84451a80aa764cad3ac77a7d667f 100644 (file)
--- a/protocol.c
+++ b/protocol.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "config.h"
 #include "environment.h"
 #include "protocol.h"

diff --git a/scalar.c b/scalar.c
index f7680463e1bcc92413ef935eb81d55725a4618bc..af64f75ca6625794ecee64aac7b83d6931cfe8f3 100644 (file)
--- a/scalar.c
+++ b/scalar.c
@@ -2,7 +2,7 @@
  * The Scalar command-line interface.
  */
 
-#include "cache.h"
+#include "git-compat-util.h"
 #include "abspath.h"
 #include "gettext.h"
 #include "parse-options.h"

diff --git a/t/helper/test-date.c b/t/helper/test-date.c
index a01eec99f351a9cd51cfff4e772dfead6e2fbba8..7adadd41e0b6b6eb6e363d9eda88ccebb2c438ea 100644 (file)
--- a/t/helper/test-date.c
+++ b/t/helper/test-date.c
@@ -1,5 +1,4 @@
 #include "test-tool.h"
-#include "cache.h"
 #include "date.h"
 #include "trace.h"
 

diff --git a/trace.c b/trace.c
index d8eaa0a786ab38a7265093cf2c3e954dae139d42..592c141d785a913d45a6910f048b087204ddecdc 100644 (file)
--- a/trace.c
+++ b/trace.c
@@ -21,7 +21,7 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "cache.h"
+#include "git-compat-util.h"
 #include "abspath.h"
 #include "environment.h"
 #include "quote.h"

diff --git a/upload-pack.c b/upload-pack.c
index e17545a834a62efbaed2c1a0f6696e31e509e897..0305fb2fbdcacfb46f326ad765cd1aff3a412348 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "config.h"
 #include "environment.h"
 #include "gettext.h"