Subject: [PATCH v3 09/23] treewide: remove cache.h inclusion due to object-name.h changes

From: Elijah Newren <[email-masked]>
Date: Tue, 11 Apr 2023 00:41:50 -0700

Signed-off-by: Elijah Newren <[email-masked]>
Acked-by: Calvin Wan <[email-masked]>
---
 branch.c                         | 1 -
 checkout.c                       | 3 ++-
 fmt-merge-msg.c                  | 2 +-
 mailmap.c                        | 2 +-
 notes.c                          | 2 +-
 refs.c                           | 2 +-
 remote.c                         | 2 +-
 setup.c                          | 2 +-
 strbuf.c                         | 2 +-
 t/helper/test-oidmap.c           | 1 -
 t/helper/test-reach.c            | 1 -
 t/helper/test-submodule-config.c | 1 -
 transport-helper.c               | 2 +-
 13 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/branch.c b/branch.c
index f29743b1619..7df982693af 100644
--- 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 9235073fc0d..04238b27133 100644
--- 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 21019c932b3..5af0d4715ba 100644
--- 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 d62d7bf0e7f..28d389c1f94 100644
--- 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 c07bcbe3486..02f1aa39ae1 100644
--- 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 979ed3fbedc..d2a98e1c21f 100644
--- 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 3afedce593e..2947743d60a 100644
--- 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 8a297b3cb5c..a546da755f1 100644
--- 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 1b93d9d3c47..b2e3735ba8a 100644
--- 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 bf4fcfe6efb..de6ab77fdaa 100644
--- 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 d4fa33ae751..5b6f2174418 100644
--- 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 4758c8654e0..c7c7fdbea98 100644
--- 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 ca8bec04bb3..6b816940dc6 100644
--- 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"
-- 
2.40.0.172.g72fe1174621