Signed-off-by: Elijah Newren <newren@xxxxxxxxx> Acked-by: Calvin Wan <calvinwan@xxxxxxxxxx> --- bisect.c | 2 +- bundle.c | 2 +- commit.c | 2 +- delta-islands.c | 2 +- diff-no-index.c | 2 +- fsck.c | 2 +- http-push.c | 2 +- list-objects-filter.c | 2 +- list-objects.c | 2 +- log-tree.c | 2 +- pack-bitmap-write.c | 2 +- parse-options-cb.c | 1 - rebase-interactive.c | 2 +- submodule-config.c | 2 +- tag.c | 2 +- transport.c | 2 +- walker.c | 2 +- 17 files changed, 16 insertions(+), 17 deletions(-) diff --git a/bisect.c b/bisect.c index e708e8b6aa1..8d5f8e58851 100644 --- a/bisect.c +++ b/bisect.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "config.h" #include "commit.h" #include "diff.h" diff --git a/bundle.c b/bundle.c index 6471489975a..a5505368de5 100644 --- a/bundle.c +++ b/bundle.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "lockfile.h" #include "bundle.h" #include "environment.h" diff --git a/commit.c b/commit.c index bad31c423a4..878b4473e4c 100644 --- a/commit.c +++ b/commit.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "tag.h" #include "commit.h" #include "commit-graph.h" diff --git a/delta-islands.c b/delta-islands.c index 40f2ccfb550..c824a5f6a42 100644 --- a/delta-islands.c +++ b/delta-islands.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "alloc.h" #include "attr.h" #include "object.h" diff --git a/diff-no-index.c b/diff-no-index.c index 934a24bee58..4296940f907 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -4,7 +4,7 @@ * Copyright (c) 2008 by Junio C Hamano */ -#include "cache.h" +#include "git-compat-util.h" #include "abspath.h" #include "color.h" #include "commit.h" diff --git a/fsck.c b/fsck.c index 8ef1b022346..adbe8bf59e7 100644 --- a/fsck.c +++ b/fsck.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "alloc.h" #include "hex.h" #include "object-store.h" diff --git a/http-push.c b/http-push.c index a8af6c0f690..637a4e91f7a 100644 --- a/http-push.c +++ b/http-push.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "environment.h" #include "hex.h" #include "repository.h" diff --git a/list-objects-filter.c b/list-objects-filter.c index 8b2a45e507d..5d270ce5987 100644 --- a/list-objects-filter.c +++ b/list-objects-filter.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "alloc.h" #include "dir.h" #include "gettext.h" diff --git a/list-objects.c b/list-objects.c index df18d103063..eecca721ac0 100644 --- a/list-objects.c +++ b/list-objects.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "tag.h" #include "commit.h" #include "gettext.h" diff --git a/log-tree.c b/log-tree.c index f0e885635e0..b5cf3d8439c 100644 --- a/log-tree.c +++ b/log-tree.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "commit-reach.h" #include "config.h" #include "diff.h" diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c index 7f5f489beb0..faf67c94d37 100644 --- a/pack-bitmap-write.c +++ b/pack-bitmap-write.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "alloc.h" #include "environment.h" #include "gettext.h" diff --git a/parse-options-cb.c b/parse-options-cb.c index b4df4bcebed..26a4c7d08a9 100644 --- a/parse-options-cb.c +++ b/parse-options-cb.c @@ -1,7 +1,6 @@ #include "git-compat-util.h" #include "parse-options.h" #include "branch.h" -#include "cache.h" #include "commit.h" #include "color.h" #include "environment.h" diff --git a/rebase-interactive.c b/rebase-interactive.c index 48467a7bc4a..6ff12d7be2d 100644 --- a/rebase-interactive.c +++ b/rebase-interactive.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "commit.h" #include "environment.h" #include "gettext.h" diff --git a/submodule-config.c b/submodule-config.c index 252b90aa439..7fc0812b644 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "alloc.h" #include "dir.h" #include "environment.h" diff --git a/tag.c b/tag.c index b9fc2fc9929..96dbd5b2d55 100644 --- a/tag.c +++ b/tag.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "environment.h" #include "tag.h" #include "object-name.h" diff --git a/transport.c b/transport.c index 7374cfd1fa9..8d3ad8022a4 100644 --- a/transport.c +++ b/transport.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "advice.h" #include "alloc.h" #include "config.h" diff --git a/walker.c b/walker.c index cfbd257fdba..24ff7dfdc28 100644 --- a/walker.c +++ b/walker.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "gettext.h" #include "hex.h" #include "walker.h" -- 2.40.0.172.g72fe1174621
