treewide: remove cache.h inclusion due to object-name.h changes

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/branch.c b/branch.c
index f29743b161972dea2df79b55aaa7d7289c09ee95..7df982693af14f79a97b5c456a4416c3bd133a51 100644 (file)
--- a/branch.c
+++ b/branch.c
@@ -1,5 +1,4 @@
 #include "git-compat-util.h"
-#include "cache.h"
 #include "advice.h"
 #include "config.h"
 #include "branch.h"

diff --git a/checkout.c b/checkout.c
index 9235073fc0d6f02f54acf92631e2773229946c4b..04238b27133901e4792de0c45ceb17cb48489c21 100644 (file)
--- a/checkout.c
+++ b/checkout.c
@@ -1,9 +1,10 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "object-name.h"
 #include "remote.h"
 #include "refspec.h"
 #include "checkout.h"
 #include "config.h"
+#include "strbuf.h"
 
 struct tracking_name_data {
        /* const */ char *src_ref;

diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c
index 21019c932b3a5f73e2c190a83f76e443b972277b..5af0d4715ba22f2f1629880ec530a0752398e716 100644 (file)
--- a/fmt-merge-msg.c
+++ b/fmt-merge-msg.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "alloc.h"
 #include "config.h"
 #include "environment.h"

diff --git a/mailmap.c b/mailmap.c
index d62d7bf0e7f736f1d87c85d395b8a78078d20e3e..28d389c1f94d7b3ed459ae34d31028c0220ffe44 100644 (file)
--- a/mailmap.c
+++ b/mailmap.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "environment.h"
 #include "string-list.h"
 #include "mailmap.h"

diff --git a/notes.c b/notes.c
index c07bcbe34865d88a7acdb677319cb58309fd62f6..02f1aa39ae19e575cfbdc3c2a57873751c273159 100644 (file)
--- a/notes.c
+++ b/notes.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "config.h"
 #include "environment.h"
 #include "hex.h"

diff --git a/refs.c b/refs.c
index 979ed3fbedced74e6a365ea6c57783a513193bcc..d2a98e1c21f4e9e0be61070aeec48446b0335efc 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -2,7 +2,7 @@
  * The backend-independent part of the reference module.
  */
 
-#include "cache.h"
+#include "git-compat-util.h"
 #include "advice.h"
 #include "alloc.h"
 #include "config.h"

diff --git a/remote.c b/remote.c
index 3afedce593e31c716e7a1e9ef8ffd890c79596bf..2947743d60a5f626b1be7153d975b31eba58dc44 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "abspath.h"
 #include "alloc.h"
 #include "config.h"

diff --git a/setup.c b/setup.c
index 8a297b3cb5c161b2dc93b73a6e5be81d3fc420bf..a546da755f14fa2db301284eb993d820ba20ba10 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "abspath.h"
 #include "environment.h"
 #include "gettext.h"

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

diff --git a/t/helper/test-oidmap.c b/t/helper/test-oidmap.c
index bf4fcfe6efb0e75706ae0c80ce043c4a08f9bdb3..de6ab77fdaa91d7a35819cb77186202cba6daed0 100644 (file)
--- a/t/helper/test-oidmap.c
+++ b/t/helper/test-oidmap.c
@@ -1,5 +1,4 @@
 #include "test-tool.h"
-#include "cache.h"
 #include "hex.h"
 #include "object-name.h"
 #include "oidmap.h"

diff --git a/t/helper/test-reach.c b/t/helper/test-reach.c
index d4fa33ae751491d002ae8e3185e2113e2c334462..5b6f2174418101575302a7fd083349414d6f283e 100644 (file)
--- a/t/helper/test-reach.c
+++ b/t/helper/test-reach.c
@@ -1,5 +1,4 @@
 #include "test-tool.h"
-#include "cache.h"
 #include "alloc.h"
 #include "commit.h"
 #include "commit-reach.h"

diff --git a/t/helper/test-submodule-config.c b/t/helper/test-submodule-config.c
index 4758c8654e0f85c69f0fb145ccd6f6612270f70a..c7c7fdbea9871682aeb8773858f61b49b2f2cf44 100644 (file)
--- a/t/helper/test-submodule-config.c
+++ b/t/helper/test-submodule-config.c
@@ -1,5 +1,4 @@
 #include "test-tool.h"
-#include "cache.h"
 #include "config.h"
 #include "object-name.h"
 #include "setup.h"

diff --git a/transport-helper.c b/transport-helper.c
index ca8bec04bb3c3a4a087a95ecf8c841b4cd19305c..6b816940dc64d8803c89c866bc2d0acdae849ad6 100644 (file)
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "transport.h"
 #include "quote.h"
 #include "run-command.h"