treewide: replace cache.h with more direct headers, where possible

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

diff --git a/advice.c b/advice.c
index fd189689437c7512e549482fe696f7a2d2400cd2..a5ea460ab8696026cc47e597ad5bc85c23e8df31 100644 (file)
--- a/advice.c
+++ b/advice.c
@@ -1,6 +1,8 @@
-#include "cache.h"
+#include "git-compat-util.h"
+#include "advice.h"
 #include "config.h"
 #include "color.h"
+#include "gettext.h"
 #include "help.h"
 #include "string-list.h"
 

diff --git a/decorate.c b/decorate.c
index 2036d15967125303effff870a45066710ef99e3e..71e79daa8259684f836f0addade83d644af91601 100644 (file)
--- a/decorate.c
+++ b/decorate.c
@@ -2,7 +2,8 @@
  * decorate.c - decorate a git object with some arbitrary
  * data.
  */
-#include "cache.h"
+#include "git-compat-util.h"
+#include "hashmap.h"
 #include "object.h"
 #include "decorate.h"
 

diff --git a/diffcore-order.c b/diffcore-order.c
index 19e73311f9cd830da70428439b7b6a14d5345eec..57ccab284645693322301e59b07f6fceb62d6224 100644 (file)
--- a/diffcore-order.c
+++ b/diffcore-order.c
@@ -1,7 +1,8 @@
 /*
  * Copyright (C) 2005 Junio C Hamano
  */
-#include "cache.h"
+#include "git-compat-util.h"
+#include "gettext.h"
 #include "diff.h"
 #include "diffcore.h"
 

diff --git a/diffcore-rename.c b/diffcore-rename.c
index 62c0299984eec1c8bc3a9f18273f070492a95774..7e9ff96d435819307071fd9ff5cf94a0892bb510 100644 (file)
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -2,15 +2,19 @@
  *
  * Copyright (C) 2005 Junio C Hamano
  */
-#include "cache.h"
+#include "git-compat-util.h"
 #include "alloc.h"
 #include "diff.h"
 #include "diffcore.h"
 #include "object-store.h"
 #include "hashmap.h"
+#include "mem-pool.h"
+#include "oid-array.h"
 #include "progress.h"
 #include "promisor-remote.h"
+#include "string-list.h"
 #include "strmap.h"
+#include "trace2.h"
 
 /* Table of rename/copy destinations */
 

diff --git a/diffcore-rotate.c b/diffcore-rotate.c
index 445f060ab0010ede4009b92c3d4acb0b34f644b9..533986cf632d4231fd067b244e2776a256af8e3e 100644 (file)
--- a/diffcore-rotate.c
+++ b/diffcore-rotate.c
@@ -2,7 +2,8 @@
  * Copyright (C) 2021, Google LLC.
  * Based on diffcore-order.c, which is Copyright (C) 2005, Junio C Hamano
  */
-#include "cache.h"
+#include "git-compat-util.h"
+#include "gettext.h"
 #include "diff.h"
 #include "diffcore.h"
 

diff --git a/graph.c b/graph.c
index 568b6e7cd41512d17cc68e0595675ee858165164..2a9dc430fae105c8d6fb5a8763320ae40fb1e5c8 100644 (file)
--- a/graph.c
+++ b/graph.c
@@ -1,4 +1,5 @@
-#include "cache.h"
+#include "git-compat-util.h"
+#include "gettext.h"
 #include "config.h"
 #include "commit.h"
 #include "color.h"

diff --git a/hook.c b/hook.c
index 1a8483186349b00608d40bc3d8702aa39ffb79c8..f6ddd790988feb483554205f32bce553773911de 100644 (file)
--- a/hook.c
+++ b/hook.c
@@ -1,7 +1,10 @@
-#include "cache.h"
+#include "git-compat-util.h"
+#include "advice.h"
+#include "gettext.h"
 #include "hook.h"
 #include "run-command.h"
 #include "config.h"
+#include "strbuf.h"
 
 const char *find_hook(const char *name)
 {

diff --git a/quote.c b/quote.c
index 2453397fbbd11062b574bcd8d80449df0f29ed21..7ccb5a06cd161c46ad2deeacc19de7bec99731a2 100644 (file)
--- a/quote.c
+++ b/quote.c
@@ -1,6 +1,7 @@
 #include "cache.h"
 #include "alloc.h"
 #include "quote.h"
+#include "strbuf.h"
 #include "strvec.h"
 
 int quote_path_fully = 1;

diff --git a/sha1dc_git.c b/sha1dc_git.c
index 72709606fdf4aa71a2abb319216f34560e757bed..9b675a046ee699189f54e31cf9a4e8bfc6d304a6 100644 (file)
--- a/sha1dc_git.c
+++ b/sha1dc_git.c
@@ -1,4 +1,5 @@
-#include "cache.h"
+#include "git-compat-util.h"
+#include "sha1dc_git.h"
 #include "hex.h"
 
 #ifdef DC_SHA1_EXTERNAL

diff --git a/unix-socket.c b/unix-socket.c
index e0be1badb58dee8af8e28c4a4486bf0fdba18a9c..79800d80636fc57fa8cc2696e33013c1c29e86b3 100644 (file)
--- a/unix-socket.c
+++ b/unix-socket.c
@@ -1,4 +1,5 @@
-#include "cache.h"
+#include "git-compat-util.h"
+#include "strbuf.h"
 #include "unix-socket.h"
 
 #define DEFAULT_UNIX_STREAM_LISTEN_BACKLOG (5)

diff --git a/url.c b/url.c
index bf318c05205e4fd1050ba123de4e09dcd2bcd50c..2e1a9f6feec96b055a9415748eb721937461c07f 100644 (file)
--- a/url.c
+++ b/url.c
@@ -1,5 +1,6 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "hex.h"
+#include "strbuf.h"
 #include "url.h"
 
 int is_urlschemechar(int first_flag, int ch)

diff --git a/urlmatch.c b/urlmatch.c
index 2965cbe774ff12a67dd19e93b4f4d0467975a854..eba0bdd77fe75bc4c0f836d88f9b7e8c4b91c995 100644 (file)
--- a/urlmatch.c
+++ b/urlmatch.c
@@ -1,5 +1,7 @@
-#include "cache.h"
+#include "git-compat-util.h"
+#include "gettext.h"
 #include "hex.h"
+#include "strbuf.h"
 #include "urlmatch.h"
 
 #define URL_ALPHA "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"