From: Elijah Newren <newren@xxxxxxxxx> A number of files were apparently including cache.h solely to get gettext.h. By making those files explicitly include gettext.h, we can already drop the include of cache.h in these files. Remove those now unnecessary includes. Signed-off-by: Elijah Newren <newren@xxxxxxxxx> --- compat/linux/procinfo.c | 2 +- compat/simple-ipc/ipc-shared.c | 2 +- connected.c | 2 +- grep.c | 2 +- negotiator/default.c | 2 +- negotiator/skipping.c | 2 +- notes-cache.c | 2 +- patch-ids.c | 2 +- reflog.c | 2 +- refs/iterator.c | 2 +- replace-object.c | 2 +- t/helper/test-hash.c | 1 - xdiff-interface.c | 2 +- 13 files changed, 12 insertions(+), 13 deletions(-) diff --git a/compat/linux/procinfo.c b/compat/linux/procinfo.c index bc2f9382a17..4bb2d66227b 100644 --- a/compat/linux/procinfo.c +++ b/compat/linux/procinfo.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "strbuf.h" #include "strvec.h" diff --git a/compat/simple-ipc/ipc-shared.c b/compat/simple-ipc/ipc-shared.c index 1b9d359ab68..e5e1dda8ccd 100644 --- a/compat/simple-ipc/ipc-shared.c +++ b/compat/simple-ipc/ipc-shared.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "simple-ipc.h" #include "strbuf.h" #include "pkt-line.h" diff --git a/connected.c b/connected.c index a4c0aece757..669bc4e8d69 100644 --- a/connected.c +++ b/connected.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/grep.c b/grep.c index febb076a7e6..bb8796a829f 100644 --- a/grep.c +++ b/grep.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "config.h" #include "gettext.h" #include "grep.h" diff --git a/negotiator/default.c b/negotiator/default.c index b7e79feaf04..5dd553a1fe3 100644 --- a/negotiator/default.c +++ b/negotiator/default.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "default.h" #include "../commit.h" #include "../fetch-negotiator.h" diff --git a/negotiator/skipping.c b/negotiator/skipping.c index 264acf8bbea..4157c4d72f5 100644 --- a/negotiator/skipping.c +++ b/negotiator/skipping.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "skipping.h" #include "../commit.h" #include "../fetch-negotiator.h" diff --git a/notes-cache.c b/notes-cache.c index 9dfd251a815..01a918c925e 100644 --- a/notes-cache.c +++ b/notes-cache.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "notes-cache.h" #include "object-store.h" #include "repository.h" diff --git a/patch-ids.c b/patch-ids.c index a4473a88fa2..19af7bee984 100644 --- a/patch-ids.c +++ b/patch-ids.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "diff.h" #include "commit.h" #include "hash-lookup.h" diff --git a/reflog.c b/reflog.c index d1c39374318..4e121e449d1 100644 --- a/reflog.c +++ b/reflog.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "gettext.h" #include "object-store.h" #include "reflog.h" diff --git a/refs/iterator.c b/refs/iterator.c index c9fd0bcaf90..6b680f610ef 100644 --- a/refs/iterator.c +++ b/refs/iterator.c @@ -3,7 +3,7 @@ * documentation about the design and use of reference iterators. */ -#include "cache.h" +#include "git-compat-util.h" #include "refs.h" #include "refs/refs-internal.h" #include "iterator.h" diff --git a/replace-object.c b/replace-object.c index 9e30e0362ba..e98825d5852 100644 --- a/replace-object.c +++ b/replace-object.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "gettext.h" #include "hex.h" #include "oidmap.h" diff --git a/t/helper/test-hash.c b/t/helper/test-hash.c index 016248106a7..45d829c908f 100644 --- a/t/helper/test-hash.c +++ b/t/helper/test-hash.c @@ -1,5 +1,4 @@ #include "test-tool.h" -#include "cache.h" #include "hex.h" int cmd_hash_impl(int ac, const char **av, int algo) diff --git a/xdiff-interface.c b/xdiff-interface.c index 5baf6ceb947..356356afe71 100644 --- a/xdiff-interface.c +++ b/xdiff-interface.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "config.h" #include "hex.h" #include "object-store.h" -- gitgitgadget
