treewide: remove cache.h inclusion due to previous changes

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

diff --git a/archive-zip.c b/archive-zip.c
index ef538a90df4ff3815f8b23bcebb5b2947306ae40..d0d065a312eeca3b1e9399f6d4adad46a05d8f60 100644 (file)
--- a/archive-zip.c
+++ b/archive-zip.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2006 Rene Scharfe
  */
-#include "cache.h"
+#include "git-compat-util.h"
 #include "config.h"
 #include "archive.h"
 #include "gettext.h"

diff --git a/bundle-uri.c b/bundle-uri.c
index 6d44662ee1f52f7f3f78156bae1da56b541205db..ec1552bbca211cd38f4f6ab053b89c7001292007 100644 (file)
--- a/bundle-uri.c
+++ b/bundle-uri.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "bundle-uri.h"
 #include "bundle.h"
 #include "copy.h"

diff --git a/color.c b/color.c
index f8a25ca807b3e85e6f758f2c3a931785b2f925c2..83abb11eda095e15e2b33a4588cecaa6eb1c3a28 100644 (file)
--- a/color.c
+++ b/color.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "config.h"
 #include "color.h"
 #include "editor.h"

diff --git a/combine-diff.c b/combine-diff.c
index f7e9fb574735d36e57b704c6455eae175fb42103..f8d619657767134ee56aaf57eab841e76ede00d0 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "object-store.h"
 #include "commit.h"
 #include "convert.h"

diff --git a/common-main.c b/common-main.c
index 8ab50fa37a44878c443b4496e751328fc8cd29e1..033778b3c56a3557e191d3bb74592fd00497853b 100644 (file)
--- a/common-main.c
+++ b/common-main.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "exec-cmd.h"
 #include "gettext.h"
 #include "attr.h"

diff --git a/config.c b/config.c
index 97063a0743ed7e00ebadc866969628a0d4dbcc75..2a9ed27efe5f1bbed1b85be217a1ebe05c9c62bc 100644 (file)
--- a/config.c
+++ b/config.c
@@ -5,7 +5,7 @@
  * Copyright (C) Johannes Schindelin, 2005
  *
  */
-#include "cache.h"
+#include "git-compat-util.h"
 #include "abspath.h"
 #include "advice.h"
 #include "alloc.h"

diff --git a/copy.c b/copy.c
index 923d8a6dc61886bb8cf10f3bf9da808e97c4aed1..882c79cffb0d38434dde66a307b32b460440f875 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "copy.h"
 #include "path.h"
 #include "wrapper.h"

diff --git a/credential.c b/credential.c
index 42194efc9e0717415745138a46dae3e37440e439..a600d0c1ac13296639a7d1f78478ebda948f2597 100644 (file)
--- a/credential.c
+++ b/credential.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "abspath.h"
 #include "config.h"
 #include "credential.h"

diff --git a/daemon.c b/daemon.c
index f89f99d7ef44a2f7f47c71776834901dc4231a5d..7139cc201d7560967352c701ed258c859567c26d 100644 (file)
--- a/daemon.c
+++ b/daemon.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/date.c b/date.c
index bc030da012f04d2dbf86a4c783892433aabecee5..a6ca6b318bd694d0b43b11ed70e4916fc24d9c1d 100644 (file)
--- a/date.c
+++ b/date.c
@@ -4,7 +4,7 @@
  * Copyright (C) Linus Torvalds, 2005
  */
 
-#include "cache.h"
+#include "git-compat-util.h"
 #include "date.h"
 #include "gettext.h"
 #include "pager.h"

diff --git a/diagnose.c b/diagnose.c
index f9a2496c7ff07db8367a0b6db1e5e0496403c253..58f49f76c7a59df180ccf74f3def8dc471434428 100644 (file)
--- a/diagnose.c
+++ b/diagnose.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "diagnose.h"
 #include "compat/disk.h"
 #include "archive.h"

diff --git a/environment.c b/environment.c
index 541f0b19acf46a3208854157e1c83b8efe94f9ac..28d18eaca8ee0a1edd33f1faebae9f8c19fbba4c 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -7,7 +7,7 @@
  * even if you might want to know where the git directory etc
  * are.
  */
-#include "cache.h"
+#include "git-compat-util.h"
 #include "abspath.h"
 #include "branch.h"
 #include "convert.h"

diff --git a/ll-merge.c b/ll-merge.c
index 85517e668e3747a158a43180bd20f0b77b198cdb..1993530688e170ad5714cfba4a041bb51b3d8f62 100644 (file)
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -4,7 +4,7 @@
  * Copyright (c) 2007 Junio C Hamano
  */
 
-#include "cache.h"
+#include "git-compat-util.h"
 #include "config.h"
 #include "convert.h"
 #include "attr.h"

diff --git a/match-trees.c b/match-trees.c
index 9b78d99507b92113392e2ae848f9ebd88a6454fa..6bc8eb76477b75e3b8ed32a1f9770e27f235e80f 100644 (file)
--- a/match-trees.c
+++ b/match-trees.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "hex.h"
 #include "match-trees.h"
 #include "tree.h"

diff --git a/midx.c b/midx.c
index 2d0da5732812b3ded5954dbc15429fedb83e9ec4..c7679c3c4f5430bbf0261a8c60971bf1205123b0 100644 (file)
--- a/midx.c
+++ b/midx.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/object-file.c b/object-file.c
index 8163ddbaddd309b911e2075d7db2a1a5af55307a..8e0df7360ae48297975746adcf1ff86b16d25f5a 100644 (file)
--- a/object-file.c
+++ b/object-file.c
@@ -6,7 +6,7 @@
  * This handles basic git object files - packing, unpacking,
  * creation etc.
  */
-#include "cache.h"
+#include "git-compat-util.h"
 #include "abspath.h"
 #include "alloc.h"
 #include "config.h"

diff --git a/packfile.c b/packfile.c
index 9ae2278c22edc59207e150f9effb43c745426c2b..1ee9f65242c7dde00c3cef6daa4fc80ea62b3096 100644 (file)
--- a/packfile.c
+++ b/packfile.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/pkt-line.c b/pkt-line.c
index 8b5fa788517056b3f22e981fa60b24e94b36e33b..62b4208b66e15d72257f5a2b72f4fa6ce3684376 100644 (file)
--- a/pkt-line.c
+++ b/pkt-line.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "copy.h"
 #include "pkt-line.h"
 #include "gettext.h"

diff --git a/range-diff.c b/range-diff.c
index a1e0cffb9f6cbd15081a6ee154b415db91c22b7b..6a704e6f4719d85f5c3bc49c4999a4dac0bd65cc 100644 (file)
--- a/range-diff.c
+++ b/range-diff.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "environment.h"
 #include "gettext.h"
 #include "range-diff.h"

diff --git a/ref-filter.c b/ref-filter.c
index 5387f79be6d2636fbaeb634cbfce1524e69d9ccc..594e66ad3612ee0925e78cf5d12f0db3a3b65ffa 100644 (file)
--- a/ref-filter.c
+++ b/ref-filter.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/t/helper/test-match-trees.c b/t/helper/test-match-trees.c
index 3c62e33ccdf5ea1eaab744879d99f75f925e63a5..a0afc1b4bc8c6f7f0477546ec56295801f32144f 100644 (file)
--- a/t/helper/test-match-trees.c
+++ b/t/helper/test-match-trees.c
@@ -1,5 +1,4 @@
 #include "test-tool.h"
-#include "cache.h"
 #include "hex.h"
 #include "match-trees.h"
 #include "object-name.h"

diff --git a/t/helper/test-mergesort.c b/t/helper/test-mergesort.c
index 3aabae6c1c4a5cf0e6c81244d6d119a269338207..42ccc8705167b07266a5c3902fba7cb7a8081c64 100644 (file)
--- a/t/helper/test-mergesort.c
+++ b/t/helper/test-mergesort.c
@@ -1,5 +1,4 @@
 #include "test-tool.h"
-#include "cache.h"
 #include "mem-pool.h"
 #include "mergesort.h"
 #include "strbuf.h"

diff --git a/t/helper/test-oid-array.c b/t/helper/test-oid-array.c
index ea3bf278984ffa88423af44d929359197aa184cc..241e5da315738ca6b5e712c0eddcc3377da47f9a 100644 (file)
--- a/t/helper/test-oid-array.c
+++ b/t/helper/test-oid-array.c
@@ -1,5 +1,4 @@
 #include "test-tool.h"
-#include "cache.h"
 #include "hex.h"
 #include "oid-array.h"
 #include "setup.h"

diff --git a/t/helper/test-oidtree.c b/t/helper/test-oidtree.c
index 796c9811e0fd01f94ee9059de37c87463e5d330a..dc509fb8065849e83eb156cd7dbda8ce3f46bec3 100644 (file)
--- a/t/helper/test-oidtree.c
+++ b/t/helper/test-oidtree.c
@@ -1,5 +1,4 @@
 #include "test-tool.h"
-#include "cache.h"
 #include "hex.h"
 #include "oidtree.h"
 #include "setup.h"

diff --git a/t/helper/test-parse-options.c b/t/helper/test-parse-options.c
index 20a81a1eb2145af4d015d0bd8b52027b9de4859a..3003987ec177d8a60c44f8c7d6ad5fee8c9136fe 100644 (file)
--- a/t/helper/test-parse-options.c
+++ b/t/helper/test-parse-options.c
@@ -1,5 +1,4 @@
 #include "test-tool.h"
-#include "cache.h"
 #include "parse-options.h"
 #include "strbuf.h"
 #include "string-list.h"

diff --git a/t/helper/test-read-midx.c b/t/helper/test-read-midx.c
index b32abff7f117dfb9368b6437d90508e7c3c7353c..211addaa005c9f13d09eac2277984fb9403134c8 100644 (file)
--- a/t/helper/test-read-midx.c
+++ b/t/helper/test-read-midx.c
@@ -1,5 +1,4 @@
 #include "test-tool.h"
-#include "cache.h"
 #include "hex.h"
 #include "midx.h"
 #include "repository.h"

diff --git a/t/helper/test-string-list.c b/t/helper/test-string-list.c
index 959f27c74c61fb39057a0982424e2be32d66bc88..042c6ff0059f64630551d437d3f0c6def4080823 100644 (file)
--- a/t/helper/test-string-list.c
+++ b/t/helper/test-string-list.c
@@ -1,5 +1,4 @@
 #include "test-tool.h"
-#include "cache.h"
 #include "strbuf.h"
 #include "string-list.h"
 

diff --git a/tree-diff.c b/tree-diff.c
index a76e6dae619f9f1e59fc86cd167a3b5069af0abb..9ea2dd7a6c3d305420e68258ccc17a08f47ee79d 100644 (file)
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -1,7 +1,7 @@
 /*
  * Helper functions for tree diff generation
  */
-#include "cache.h"
+#include "git-compat-util.h"
 #include "diff.h"
 #include "diffcore.h"
 #include "tree.h"

diff --git a/tree-walk.c b/tree-walk.c
index 2993c48c2f31072d7d1109df85d58dbcbf321caa..d3c48e06df05b707af9f753fd4a3d4641173c00c 100644 (file)
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "tree-walk.h"
 #include "alloc.h"
 #include "dir.h"

diff --git a/tree.c b/tree.c
index f242a7ab6918a16d38e5efae801739dc41813a39..0dd2029a8a2905338ac7d7cd9062bd9662a2e9f0 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "cache-tree.h"
 #include "hex.h"
 #include "tree.h"

diff --git a/wrapper.c b/wrapper.c
index 5ab0460de5c1de713eaedec508ffebc2a73a13dd..67f5f5dbe199f8362cad205a19f968687cb2906b 100644 (file)
--- a/wrapper.c
+++ b/wrapper.c
@@ -1,10 +1,11 @@
 /*
  * Various trivial helper wrappers around standard functions
  */
-#include "cache.h"
+#include "git-compat-util.h"
 #include "abspath.h"
 #include "config.h"
 #include "gettext.h"
+#include "object.h"
 #include "repository.h"
 #include "strbuf.h"
 #include "trace2.h"