cache.h: remove this no-longer-used header

Since this header showed up in some places besides just #include
statements, update/clean-up/remove those other places as well.

Note that compat/fsmonitor/fsm-path-utils-darwin.c previously got
away with violating the rule that all files must start with an include
of git-compat-util.h (or a short-list of alternate headers that happen
to include it first).  This change exposed the violation and caused it
to stop building correctly; fix it by having it include
git-compat-util.h first, as per policy.

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

diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index 003393ed161dab04a5c73269d49fa2e2f2fdd1f6..2b472df29d5d8adbfa6d3bffa5ba5c712c225e64 100644 (file)
--- a/Documentation/CodingGuidelines
+++ b/Documentation/CodingGuidelines
@@ -444,7 +444,7 @@ For C programs:
  - The first #include in C files, except in platform specific compat/
    implementations and sha1dc/, must be either "git-compat-util.h" or
    one of the approved headers that includes it first for you.  (The
-   approved headers currently include "cache.h", "builtin.h",
+   approved headers currently include "builtin.h",
    "t/helper/test-tool.h", "xdiff/xinclude.h", or
    "reftable/system.h").  You do not have to include more than one of
    these.

diff --git a/Documentation/MyFirstObjectWalk.txt b/Documentation/MyFirstObjectWalk.txt
index eee513e86f4d645a47afcae4921de89b413fc1be..200e628e301284bf0afca715660bfd8ec98e268d 100644 (file)
--- a/Documentation/MyFirstObjectWalk.txt
+++ b/Documentation/MyFirstObjectWalk.txt
@@ -124,7 +124,7 @@ parameters provided by the user over the CLI.
 
 `nr` represents the number of `rev_cmdline_entry` present in the array.
 
-`alloc` is used by the `ALLOC_GROW` macro. Check `cache.h` - this variable is
+`alloc` is used by the `ALLOC_GROW` macro. Check `alloc.h` - this variable is
 used to track the allocated size of the list.
 
 Per entry, we find:

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index aa385137adc31ebb86b321bdbe1ae546350e4a0b..4281396093d7c92d22ccf2a8f7dd7c98400445e2 100644 (file)
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -4129,13 +4129,11 @@ Note that terminology has changed since that revision.  For example, the
 README in that revision uses the word "changeset" to describe what we
 now call a <<def_commit_object,commit>>.
 
-Also, we do not call it "cache" any more, but rather "index"; however, the
-file is still called `cache.h`.  Remark: Not much reason to change it now,
-especially since there is no good single name for it anyway, because it is
-basically _the_ header file which is included by _all_ of Git's C sources.
+Also, we do not call it "cache" any more, but rather "index"; however,
+the file is still called `read-cache.h`.
 
 If you grasp the ideas in that initial commit, you should check out a
-more recent version and skim `cache.h`, `object.h` and `commit.h`.
+more recent version and skim `read-cache-ll.h`, `object.h` and `commit.h`.
 
 In the early days, Git (in the tradition of UNIX) was a bunch of programs
 which were extremely simple, and which you used in scripts, piping the
@@ -4146,11 +4144,11 @@ many of these parts have become builtins, and some of the core has been
 and to avoid code duplication.
 
 By now, you know what the index is (and find the corresponding data
-structures in `cache.h`), and that there are just a couple of object types
-(blobs, trees, commits and tags) which inherit their common structure from
-`struct object`, which is their first member (and thus, you can cast e.g.
-`(struct object *)commit` to achieve the _same_ as `&commit->object`, i.e.
-get at the object name and flags).
+structures in `read-cache-ll.h`), and that there are just a couple of
+object types (blobs, trees, commits and tags) which inherit their
+common structure from `struct object`, which is their first member
+(and thus, you can cast e.g.  `(struct object *)commit` to achieve the
+_same_ as `&commit->object`, i.e.  get at the object name and flags).
 
 Now is a good point to take a break to let this information sink in.
 

diff --git a/Makefile b/Makefile
index 339c29849e428ebed2c367f7632b36e86eb53ee8..e62db9460d91507cee45a53b61ed955acb8c955a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1952,7 +1952,7 @@ endif
        BASIC_CFLAGS += \
                -DSHA1DC_NO_STANDARD_INCLUDES \
                -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 \
-               -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" \
+               -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" \
                -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""
 endif
 endif

diff --git a/add-interactive.c b/add-interactive.c
index a9671e33491fb17b266af4c4e16f0346bd23c977..40f88c0205103f67cb9549f6e7b02397358d69cf 100644 (file)
--- a/add-interactive.c
+++ b/add-interactive.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "add-interactive.h"
 #include "color.h"
 #include "config.h"

diff --git a/add-patch.c b/add-patch.c
index 7d4d298286d4dd4ba4fefbc4c7c891cb678a3477..875b96e22740b5a802c686c946508ebee0b23077 100644 (file)
--- a/add-patch.c
+++ b/add-patch.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "add-interactive.h"
 #include "advice.h"
 #include "alloc.h"

diff --git a/apply.c b/apply.c
index f056c8f3bb9567c62fd4e96e25e2db964e44c90a..e44a5dd7c505126b4c9d8356a3af1264588e8abe 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -7,7 +7,7 @@
  *
  */
 
-#include "cache.h"
+#include "git-compat-util.h"
 #include "abspath.h"
 #include "alloc.h"
 #include "base85.h"

diff --git a/attr.c b/attr.c
index 475241c5c49ed070cd19a9f25f7f4d23c1fe0ed1..b659f415d842f354549bdeff2e531bdd497da856 100644 (file)
--- a/attr.c
+++ b/attr.c
@@ -6,7 +6,7 @@
  * an insanely large number of attributes.
  */
 
-#include "cache.h"
+#include "git-compat-util.h"
 #include "alloc.h"
 #include "config.h"
 #include "environment.h"

diff --git a/blame.c b/blame.c
index a0c7b5c065772ed60cd20c2cb33b0595eaf41338..ab3c6108cc0df878027c8abb185aaf4bcc8b9e6b 100644 (file)
--- a/blame.c
+++ b/blame.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "refs.h"
 #include "object-store.h"
 #include "cache-tree.h"

diff --git a/builtin.h b/builtin.h
index cb0db676814d8a43dd3e5cb3a7a729676f5a429d..3e6c22eef69ea92fd7f8ada81f552e18c6a11e43 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -3,7 +3,6 @@
 
 #include "git-compat-util.h"
 #include "strbuf.h"
-#include "cache.h"
 #include "commit.h"
 
 /*

diff --git a/builtin/add.c b/builtin/add.c
index 9fe6b6ce2908c5946316fa324c28851f93ca7f0e..50792c0d495ebd3180d066386f7500e1a9730279 100644 (file)
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -4,10 +4,9 @@
  * Copyright (C) 2006 Linus Torvalds
  */
 #define USE_THE_INDEX_VARIABLE
-#include "cache.h"
+#include "builtin.h"
 #include "advice.h"
 #include "config.h"
-#include "builtin.h"
 #include "lockfile.h"
 #include "editor.h"
 #include "dir.h"

diff --git a/builtin/am.c b/builtin/am.c
index 0d8f46f8d5a276b963f4f92c84aec7983261b487..2f0f2337915b094eb26c1fe2156e80373aee6c16 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -4,11 +4,10 @@
  * Based on git-am.sh by Junio C Hamano.
  */
 #define USE_THE_INDEX_VARIABLE
-#include "cache.h"
+#include "builtin.h"
 #include "abspath.h"
 #include "advice.h"
 #include "config.h"
-#include "builtin.h"
 #include "editor.h"
 #include "environment.h"
 #include "exec-cmd.h"

diff --git a/builtin/apply.c b/builtin/apply.c
index e3ff02a09e3e8031712d1979a9b5dbfd2b8ccbf4..c18b7ea5d3da4aa66d82c9fa0e911274308ad598 100644 (file)
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -1,4 +1,3 @@
-#include "cache.h"
 #include "builtin.h"
 #include "gettext.h"
 #include "parse-options.h"

diff --git a/builtin/archive.c b/builtin/archive.c
index b0eaa3c14a3236990e188b82b020415ce698b7de..90761fdfee0f58f0d2d8cca9c7b0bcd6e0ee7fe9 100644 (file)
--- a/builtin/archive.c
+++ b/builtin/archive.c
@@ -2,7 +2,6 @@
  * Copyright (c) 2006 Franck Bui-Huu
  * Copyright (c) 2006 Rene Scharfe
  */
-#include "cache.h"
 #include "builtin.h"
 #include "archive.h"
 #include "gettext.h"

diff --git a/builtin/bisect.c b/builtin/bisect.c
index 4812450c393da3e2df36521c5f0295ad48e65fe2..bce0ee6268ad78ec01b03b5a625a869e25b27302 100644 (file)
--- a/builtin/bisect.c
+++ b/builtin/bisect.c
@@ -1,5 +1,4 @@
 #include "builtin.h"
-#include "cache.h"
 #include "copy.h"
 #include "environment.h"
 #include "gettext.h"

diff --git a/builtin/branch.c b/builtin/branch.c
index e6c2655af68b339a7aa863cedd6d75e5176dd443..c480fa212136699011bbcf598f471247a355b170 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -5,14 +5,13 @@
  * Based on git-branch.sh by Junio C Hamano.
  */
 
-#include "cache.h"
+#include "builtin.h"
 #include "config.h"
 #include "color.h"
 #include "editor.h"
 #include "environment.h"
 #include "refs.h"
 #include "commit.h"
-#include "builtin.h"
 #include "gettext.h"
 #include "object-name.h"
 #include "remote.h"

diff --git a/builtin/bundle.c b/builtin/bundle.c
index 44113389d7a34a7cf3fde15a52c3387d851f44db..3f63631c0393bc665793d36ca0c6921ad6ace737 100644 (file)
--- a/builtin/bundle.c
+++ b/builtin/bundle.c
@@ -6,7 +6,6 @@
 #include "parse-options.h"
 #include "pkt-line.h"
 #include "repository.h"
-#include "cache.h"
 #include "bundle.h"
 
 /*

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 0bafc14e6c03ac1c034e64878b884ebcb15128af..9646e7209ca5a5b92983ec8a437994c871ba6b03 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -4,11 +4,10 @@
  * Copyright (C) Linus Torvalds, 2005
  */
 #define USE_THE_INDEX_VARIABLE
-#include "cache.h"
+#include "builtin.h"
 #include "alloc.h"
 #include "config.h"
 #include "convert.h"
-#include "builtin.h"
 #include "diff.h"
 #include "environment.h"
 #include "gettext.h"

diff --git a/builtin/check-attr.c b/builtin/check-attr.c
index e27b86d150588b15b1884d456aba2ac17bd3e2be..b22ff748c3e20819887084f1175015a9a6078815 100644 (file)
--- a/builtin/check-attr.c
+++ b/builtin/check-attr.c
@@ -1,6 +1,5 @@
 #define USE_THE_INDEX_VARIABLE
 #include "builtin.h"
-#include "cache.h"
 #include "config.h"
 #include "attr.h"
 #include "environment.h"

diff --git a/builtin/check-ignore.c b/builtin/check-ignore.c
index e4b78782a321920bab57404a63d35019a26c90ac..906cd967536c6f3a90c0a57cb4f3649e7b0da804 100644 (file)
--- a/builtin/check-ignore.c
+++ b/builtin/check-ignore.c
@@ -1,6 +1,5 @@
 #define USE_THE_INDEX_VARIABLE
 #include "builtin.h"
-#include "cache.h"
 #include "config.h"
 #include "dir.h"
 #include "gettext.h"

diff --git a/builtin/check-ref-format.c b/builtin/check-ref-format.c
index 57f0505070f6293460803ad670e491d98240c1ca..5eb6bdc3f691e8a71e07fc2be80ee94e3599f522 100644 (file)
--- a/builtin/check-ref-format.c
+++ b/builtin/check-ref-format.c
@@ -2,9 +2,8 @@
  * GIT - The information manager from hell
  */
 
-#include "cache.h"
-#include "refs.h"
 #include "builtin.h"
+#include "refs.h"
 #include "setup.h"
 #include "strbuf.h"
 

diff --git a/builtin/clean.c b/builtin/clean.c
index 49c7af45b038d54d8b0206c68bd09fcfb423724b..66b4479356d57dc1dab76989b4f6978c68da674e 100644 (file)
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -9,7 +9,6 @@
 #define USE_THE_INDEX_VARIABLE
 #include "builtin.h"
 #include "abspath.h"
-#include "cache.h"
 #include "config.h"
 #include "dir.h"
 #include "gettext.h"

diff --git a/builtin/column.c b/builtin/column.c
index de623a16c2d2f5bd4e206f9c84721be1b454281b..ce13ff0baa271060fd917efbd49926b6cb773240 100644 (file)
--- a/builtin/column.c
+++ b/builtin/column.c
@@ -1,5 +1,4 @@
 #include "builtin.h"
-#include "cache.h"
 #include "config.h"
 #include "gettext.h"
 #include "strbuf.h"

diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c
index d1d251c3ded2798ecb6667034bb7e21477be847d..d2121f30d45bd75fea852393920dab76320f25d6 100644 (file)
--- a/builtin/commit-tree.c
+++ b/builtin/commit-tree.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) Linus Torvalds, 2005
  */
-#include "cache.h"
+#include "builtin.h"
 #include "config.h"
 #include "gettext.h"
 #include "hex.h"
@@ -12,7 +12,6 @@
 #include "repository.h"
 #include "commit.h"
 #include "tree.h"
-#include "builtin.h"
 #include "utf8.h"
 #include "gpg-interface.h"
 #include "parse-options.h"

diff --git a/builtin/commit.c b/builtin/commit.c
index 829daaca9d1a62525bf720854cd3f7fab021ce49..acf21789a0c33f37183de34d0a54e7bef568ead8 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -6,7 +6,7 @@
  */
 
 #define USE_THE_INDEX_VARIABLE
-#include "cache.h"
+#include "builtin.h"
 #include "advice.h"
 #include "config.h"
 #include "lockfile.h"
@@ -15,7 +15,6 @@
 #include "dir.h"
 #include "editor.h"
 #include "environment.h"
-#include "builtin.h"
 #include "diff.h"
 #include "diffcore.h"
 #include "commit.h"

diff --git a/builtin/count-objects.c b/builtin/count-objects.c
index f3d8f1bcbb00902356d0bb5f0637b04672af7fe9..b9e6b55a9a92955eba7afca3e585fdf634d34303 100644 (file)
--- a/builtin/count-objects.c
+++ b/builtin/count-objects.c
@@ -4,13 +4,12 @@
  * Copyright (c) 2006 Junio C Hamano
  */
 
-#include "cache.h"
+#include "builtin.h"
 #include "config.h"
 #include "dir.h"
 #include "environment.h"
 #include "gettext.h"
 #include "repository.h"
-#include "builtin.h"
 #include "parse-options.h"
 #include "quote.h"
 #include "packfile.h"

diff --git a/builtin/describe.c b/builtin/describe.c
index f1be7c3694896805c6d274bb36051c5a56f49126..508e8df00ef0a355f30d1e99e359bb72c0aabe00 100644 (file)
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -1,5 +1,5 @@
 #define USE_THE_INDEX_VARIABLE
-#include "cache.h"
+#include "builtin.h"
 #include "config.h"
 #include "environment.h"
 #include "gettext.h"
@@ -9,7 +9,6 @@
 #include "tag.h"
 #include "blob.h"
 #include "refs.h"
-#include "builtin.h"
 #include "exec-cmd.h"
 #include "object-name.h"
 #include "parse-options.h"

diff --git a/builtin/diff-files.c b/builtin/diff-files.c
index 3ac175264d90eb2bd52a5bbd6e67960aa8034aa1..a4a2ab76c72732538ad16ad9888f89c2789c9ff1 100644 (file)
--- a/builtin/diff-files.c
+++ b/builtin/diff-files.c
@@ -3,14 +3,13 @@
  *
  * Copyright (C) Linus Torvalds, 2005
  */
-#include "cache.h"
+#include "builtin.h"
 #include "config.h"
 #include "diff.h"
 #include "diff-merges.h"
 #include "commit.h"
 #include "preload-index.h"
 #include "revision.h"
-#include "builtin.h"
 #include "submodule.h"
 
 static const char diff_files_usage[] =

diff --git a/builtin/diff-index.c b/builtin/diff-index.c
index 9b98db2e77ed8ec0be082088be81c872dc56020a..1ab8f8b6dc55f57b1e2a9f1257b729d8bc5d56af 100644 (file)
--- a/builtin/diff-index.c
+++ b/builtin/diff-index.c
@@ -1,11 +1,10 @@
-#include "cache.h"
+#include "builtin.h"
 #include "config.h"
 #include "diff.h"
 #include "diff-merges.h"
 #include "commit.h"
 #include "preload-index.h"
 #include "revision.h"
-#include "builtin.h"
 #include "setup.h"
 #include "submodule.h"
 

diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c
index 8f7dff8eb36b889f418eeda4c11413e038c3a92d..f3a458bb870af27032c2588031a0df177a744285 100644 (file)
--- a/builtin/diff-tree.c
+++ b/builtin/diff-tree.c
@@ -1,12 +1,11 @@
 #define USE_THE_INDEX_VARIABLE
-#include "cache.h"
+#include "builtin.h"
 #include "config.h"
 #include "diff.h"
 #include "commit.h"
 #include "gettext.h"
 #include "hex.h"
 #include "log-tree.h"
-#include "builtin.h"
 #include "submodule.h"
 #include "read-cache-ll.h"
 #include "repository.h"

diff --git a/builtin/diff.c b/builtin/diff.c
index a9ce701ff9764e482887a0a227f4093b989de036..b19530c996c7cd43be9baa3649c93247de888ebd 100644 (file)
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -4,7 +4,7 @@
  * Copyright (c) 2006 Junio C Hamano
  */
 #define USE_THE_INDEX_VARIABLE
-#include "cache.h"
+#include "builtin.h"
 #include "config.h"
 #include "ewah/ewok.h"
 #include "lockfile.h"
@@ -20,7 +20,6 @@
 #include "read-cache-ll.h"
 #include "revision.h"
 #include "log-tree.h"
-#include "builtin.h"
 #include "setup.h"
 #include "submodule.h"
 #include "oid-array.h"

diff --git a/builtin/difftool.c b/builtin/difftool.c
index 88809976c5349720f454346447b0464c0cc6a414..4a22de3eddbbb2fe00aef5b8e77241c09d39234f 100644 (file)
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -12,11 +12,10 @@
  * Copyright (C) 2016 Johannes Schindelin
  */
 #define USE_THE_INDEX_VARIABLE
-#include "cache.h"
+#include "builtin.h"
 #include "abspath.h"
 #include "config.h"
 #include "copy.h"
-#include "builtin.h"
 #include "run-command.h"
 #include "environment.h"
 #include "exec-cmd.h"

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 9a95f6a1a82affafc02895cce56ed9a790c6666c..5f3ffd6912f47eb04961910d09bc6aa60c8f943f 100644 (file)
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -4,7 +4,6 @@
  * Copyright (C) 2007 Johannes E. Schindelin
  */
 #include "builtin.h"
-#include "cache.h"
 #include "config.h"
 #include "gettext.h"
 #include "hex.h"

diff --git a/builtin/fast-import.c b/builtin/fast-import.c
index bbd9b2b3e715db7e84011cc41542e2fe6dd4d4f0..67a2260a5eb0274f0d9fffda62245ef09d836bdc 100644 (file)
--- a/builtin/fast-import.c
+++ b/builtin/fast-import.c
@@ -1,6 +1,5 @@
 #include "builtin.h"
 #include "abspath.h"
-#include "cache.h"
 #include "environment.h"
 #include "gettext.h"
 #include "hex.h"

diff --git a/builtin/fetch.c b/builtin/fetch.c
index e3871048cf60c7c3da151571b55501ceddb4494f..2c6f4d3dff3b31a8d5dce5644ed9c14c8bc8e0ca 100644 (file)
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -1,7 +1,7 @@
 /*
  * "git fetch"
  */
-#include "cache.h"
+#include "builtin.h"
 #include "advice.h"
 #include "config.h"
 #include "gettext.h"
@@ -15,7 +15,6 @@
 #include "oidset.h"
 #include "oid-array.h"
 #include "commit.h"
-#include "builtin.h"
 #include "string-list.h"
 #include "remote.h"
 #include "transport.h"

diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 695fc8f4a5e5622b15de4167f892559aaa8aafd4..d0d6ab0fd3453c323bafabe09cd47ffee8e5aa82 100644 (file)
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -1,5 +1,4 @@
 #include "builtin.h"
-#include "cache.h"
 #include "config.h"
 #include "gettext.h"
 #include "refs.h"

diff --git a/builtin/for-each-repo.c b/builtin/for-each-repo.c
index 37daf7bec143e8e72f1a6b91fd2c8d9381840c1c..28186b30f54818cdbb42a4876358b7ceb20d20e2 100644 (file)
--- a/builtin/for-each-repo.c
+++ b/builtin/for-each-repo.c
@@ -1,6 +1,5 @@
-#include "cache.h"
-#include "config.h"
 #include "builtin.h"
+#include "config.h"
 #include "gettext.h"
 #include "parse-options.h"
 #include "path.h"

diff --git a/builtin/fsck.c b/builtin/fsck.c
index d4e04bb36e04d63857737cc803b1669a1864ab2f..3e169f413ddda77865acd6f8d7e322f9a22058d6 100644 (file)
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -1,5 +1,4 @@
 #include "builtin.h"
-#include "cache.h"
 #include "gettext.h"
 #include "hex.h"
 #include "repository.h"

diff --git a/builtin/get-tar-commit-id.c b/builtin/get-tar-commit-id.c
index 564cfcac4fb0ac4c9de1748b816f395d45665cbb..9303e386cc7031b2111527cafc779df7d23e892a 100644 (file)
--- a/builtin/get-tar-commit-id.c
+++ b/builtin/get-tar-commit-id.c
@@ -1,10 +1,9 @@
 /*
  * Copyright (c) 2005, 2006 Rene Scharfe
  */
-#include "cache.h"
+#include "builtin.h"
 #include "commit.h"
 #include "tar.h"
-#include "builtin.h"
 #include "quote.h"
 #include "wrapper.h"
 

diff --git a/builtin/grep.c b/builtin/grep.c
index 0d567575890087e0a429165c538316ab48a46afe..7638d779000b52279030cb2ad138d6b8cd746aae 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2006 Junio C Hamano
  */
-#include "cache.h"
+#include "builtin.h"
 #include "alloc.h"
 #include "gettext.h"
 #include "hex.h"
@@ -14,7 +14,6 @@
 #include "commit.h"
 #include "tag.h"
 #include "tree-walk.h"
-#include "builtin.h"
 #include "parse-options.h"
 #include "string-list.h"
 #include "run-command.h"

diff --git a/builtin/help.c b/builtin/help.c
index d3cf4af3f6ebee4893bb754530a3c7b5c375c9aa..e93533fb09e3d8d043fdfd42aeb58688a20f6cd2 100644 (file)
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -1,9 +1,8 @@
 /*
  * Builtin help command
  */
-#include "cache.h"
-#include "config.h"
 #include "builtin.h"
+#include "config.h"
 #include "exec-cmd.h"
 #include "gettext.h"
 #include "pager.h"

diff --git a/builtin/hook.c b/builtin/hook.c
index 88051795c7f5bf016fc5856167c5d350827dff2e..09b51a6487c3928bc099567109193c32fe82fe30 100644 (file)
--- a/builtin/hook.c
+++ b/builtin/hook.c
@@ -1,4 +1,3 @@
-#include "cache.h"
 #include "builtin.h"
 #include "config.h"
 #include "gettext.h"

diff --git a/builtin/init-db.c b/builtin/init-db.c
index feb019a9deae912b6f10ee7d876689e66cb68969..680ef7e183796592070c3eb66696898ccb398428 100644 (file)
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -3,12 +3,11 @@
  *
  * Copyright (C) Linus Torvalds, 2005
  */
-#include "cache.h"
+#include "builtin.h"
 #include "abspath.h"
 #include "config.h"
 #include "environment.h"
 #include "gettext.h"
-#include "builtin.h"
 #include "object-file.h"
 #include "parse-options.h"
 #include "path.h"

diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c
index 107ac28f0e8cb0cb6d6f0ac31102a165a4850b20..c5e83452654de9242f01a4045fb90f3f058ea8f7 100644 (file)
--- a/builtin/interpret-trailers.c
+++ b/builtin/interpret-trailers.c
@@ -5,7 +5,6 @@
  *
  */
 
-#include "cache.h"
 #include "builtin.h"
 #include "gettext.h"
 #include "parse-options.h"

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index a0bea8f06ce81f211978c2259fd70ac015b693e1..3e314980fe3abb24521cb48c16892cace7b48459 100644 (file)
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -5,13 +5,12 @@
  *
  * Copyright (C) Linus Torvalds, 2005
  */
-#include "cache.h"
+#include "builtin.h"
 #include "repository.h"
 #include "config.h"
 #include "convert.h"
 #include "quote.h"
 #include "dir.h"
-#include "builtin.h"
 #include "gettext.h"
 #include "object-name.h"
 #include "strbuf.h"

diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c
index cb6cb77e086bab630ec05924c5ebf173c1946ad8..a0aadc9b8ff6fbc22af439ef6fbd57203dd295e0 100644 (file)
--- a/builtin/ls-remote.c
+++ b/builtin/ls-remote.c
@@ -1,5 +1,4 @@
 #include "builtin.h"
-#include "cache.h"
 #include "gettext.h"
 #include "hex.h"
 #include "transport.h"

diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index 077977a46100327e9d611e8badb9d0c9190de33f..f4331c640fccd27e54b94ae3eb1ea9a2f695c3b3 100644 (file)
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) Linus Torvalds, 2005
  */
-#include "cache.h"
+#include "builtin.h"
 #include "config.h"
 #include "gettext.h"
 #include "hex.h"
@@ -13,7 +13,6 @@
 #include "tree.h"
 #include "commit.h"
 #include "quote.h"
-#include "builtin.h"
 #include "parse-options.h"
 #include "pathspec.h"
 

diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c
index a032a1c3881cf4d35f72e8b714204647a3e06400..53b55dd71c0537b149860c4b9c0d505ea305fe57 100644 (file)
--- a/builtin/mailinfo.c
+++ b/builtin/mailinfo.c
@@ -2,9 +2,8 @@
  * Another stupid program, this one parsing the headers of an
  * email to figure out authorship and subject
  */
-#include "cache.h"
-#include "abspath.h"
 #include "builtin.h"
+#include "abspath.h"
 #include "environment.h"
 #include "gettext.h"
 #include "utf8.h"

diff --git a/builtin/mailsplit.c b/builtin/mailsplit.c
index 0b6193a0915a1fef572bb8a1148ae02f53ecf51c..3af9ddb8ae5c7e902937ada927590d908c193e0f 100644 (file)
--- a/builtin/mailsplit.c
+++ b/builtin/mailsplit.c
@@ -4,7 +4,6 @@
  * It just splits a mbox into a list of files: "0001" "0002" ..
  * so you can process them further from there.
  */
-#include "cache.h"
 #include "builtin.h"
 #include "gettext.h"
 #include "string-list.h"

diff --git a/builtin/merge-base.c b/builtin/merge-base.c
index 854019a32dcc63c9e2504f7aa9e96e7cd7a86762..e68b7fe45d77a9b032dd6031864b876eeeca5e5c 100644 (file)
--- a/builtin/merge-base.c
+++ b/builtin/merge-base.c
@@ -1,5 +1,4 @@
 #include "builtin.h"
-#include "cache.h"
 #include "config.h"
 #include "commit.h"
 #include "gettext.h"

diff --git a/builtin/merge-file.c b/builtin/merge-file.c
index 781818d08f560714303889ff9eb002408307e244..d7eb4c654018e2bf8270ba90f1a3d945a261d025 100644 (file)
--- a/builtin/merge-file.c
+++ b/builtin/merge-file.c
@@ -1,6 +1,5 @@
 #include "builtin.h"
 #include "abspath.h"
-#include "cache.h"
 #include "config.h"
 #include "gettext.h"
 #include "setup.h"

diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c
index b9e980384a4d72c228ddf9db84bfa76304f3ec2a..3366699657c9c390f850dfcba11be08327834f50 100644 (file)
--- a/builtin/merge-recursive.c
+++ b/builtin/merge-recursive.c
@@ -1,4 +1,3 @@
-#include "cache.h"
 #include "builtin.h"
 #include "advice.h"
 #include "commit.h"

diff --git a/builtin/merge.c b/builtin/merge.c
index 6e8f7b9bb5319fe848fc56bd351ac3daf971383f..d7ac108ce946f6e0b06b73ed52d0bed903ae94da 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -7,7 +7,7 @@
  */
 
 #define USE_THE_INDEX_VARIABLE
-#include "cache.h"
+#include "builtin.h"
 #include "abspath.h"
 #include "advice.h"
 #include "alloc.h"
@@ -18,7 +18,6 @@
 #include "hex.h"
 #include "object-name.h"
 #include "parse-options.h"
-#include "builtin.h"
 #include "lockfile.h"
 #include "run-command.h"
 #include "hook.h"

diff --git a/builtin/multi-pack-index.c b/builtin/multi-pack-index.c
index 1b5083f8b26cd8f15bf8e0ee0cadd38cc35fc5c6..5bb71bce08d5cce37b909fef66f30b07ff0b32d2 100644 (file)
--- a/builtin/multi-pack-index.c
+++ b/builtin/multi-pack-index.c
@@ -1,6 +1,5 @@
 #include "builtin.h"
 #include "abspath.h"
-#include "cache.h"
 #include "config.h"
 #include "environment.h"
 #include "gettext.h"

diff --git a/builtin/notes.c b/builtin/notes.c
index d5788352b6ee7c69663ddf822134b55a36bf95b0..efdf2451486a3491ee8a8b3b141d813bd9d1aa88 100644 (file)
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -7,9 +7,8 @@
  * and builtin/tag.c by Kristian Høgsberg and Carlos Rica.
  */
 
-#include "cache.h"
-#include "config.h"
 #include "builtin.h"
+#include "config.h"
 #include "editor.h"
 #include "gettext.h"
 #include "hex.h"

diff --git a/builtin/patch-id.c b/builtin/patch-id.c
index 9d5585d3a72459725c14598738faa73529175b81..27952f1a6fd4663fe4b0184a7ba36ab4a5088542 100644 (file)
--- a/builtin/patch-id.c
+++ b/builtin/patch-id.c
@@ -1,4 +1,3 @@
-#include "cache.h"
 #include "builtin.h"
 #include "config.h"
 #include "diff.h"

diff --git a/builtin/prune.c b/builtin/prune.c
index 5dc9b20720006700584069a3b6aa1211088ff5d7..b3658b5b512dabfedb747e5911978f3cb8f51ea8 100644 (file)
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -1,11 +1,10 @@
-#include "cache.h"
+#include "builtin.h"
 #include "commit.h"
 #include "diff.h"
 #include "environment.h"
 #include "gettext.h"
 #include "hex.h"
 #include "revision.h"
-#include "builtin.h"
 #include "reachable.h"
 #include "parse-options.h"
 #include "progress.h"

diff --git a/builtin/pull.c b/builtin/pull.c
index 3052244b175866c70c2a77e97ed67241b32ee5d9..d4344950919fffb4ea15ed17b3879a2c896f5766 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -6,10 +6,9 @@
  * Fetch one or more remote refs and merge it/them into the current HEAD.
  */
 #define USE_THE_INDEX_VARIABLE
-#include "cache.h"
+#include "builtin.h"
 #include "advice.h"
 #include "config.h"
-#include "builtin.h"
 #include "gettext.h"
 #include "hex.h"
 #include "merge.h"

diff --git a/builtin/push.c b/builtin/push.c
index dbdf609daf33172cb95ff082f3e23edb88c3d806..6f8a8dc7117cb138c9bf4da9fa673e25a28bc102 100644 (file)
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -1,7 +1,7 @@
 /*
  * "git push"
  */
-#include "cache.h"
+#include "builtin.h"
 #include "advice.h"
 #include "branch.h"
 #include "config.h"
@@ -10,7 +10,6 @@
 #include "refs.h"
 #include "refspec.h"
 #include "run-command.h"
-#include "builtin.h"
 #include "remote.h"
 #include "transport.h"
 #include "parse-options.h"

diff --git a/builtin/range-diff.c b/builtin/range-diff.c
index 04339a92ea5d1a62df2aa63b73619c2a6c2167ae..8610390d7c56c7e078633ded778713e251e1746a 100644 (file)
--- a/builtin/range-diff.c
+++ b/builtin/range-diff.c
@@ -1,4 +1,3 @@
-#include "cache.h"
 #include "builtin.h"
 #include "gettext.h"
 #include "object-name.h"

diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index bd1ce1d963ffbd0f7741151a3663b35d299d598c..63c92936faaa547149af9e799f7c8429c8f6fc19 100644 (file)
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -5,7 +5,7 @@
  */
 
 #define USE_THE_INDEX_VARIABLE
-#include "cache.h"
+#include "builtin.h"
 #include "config.h"
 #include "gettext.h"
 #include "hex.h"
@@ -17,7 +17,6 @@
 #include "cache-tree.h"
 #include "unpack-trees.h"
 #include "dir.h"
-#include "builtin.h"
 #include "parse-options.h"
 #include "repository.h"
 #include "resolve-undo.h"

diff --git a/builtin/replace.c b/builtin/replace.c
index 981f1894436dd3c3d2df15c0926e2a808557703d..e0fbdc98ed319d62c76988bd2b47bc508e3e5774 100644 (file)
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -8,9 +8,8 @@
  * git-tag.sh and mktag.c by Linus Torvalds.
  */
 
-#include "cache.h"
-#include "config.h"
 #include "builtin.h"
+#include "config.h"
 #include "editor.h"
 #include "environment.h"
 #include "gettext.h"

diff --git a/builtin/rerere.c b/builtin/rerere.c
index d4bd52797f4624d31e39a2ca263c21e3130afe8f..0458db9cadff6e07e2d3f91bf15392e4e384e367 100644 (file)
--- a/builtin/rerere.c
+++ b/builtin/rerere.c
@@ -1,5 +1,4 @@
 #include "builtin.h"
-#include "cache.h"
 #include "config.h"
 #include "dir.h"
 #include "gettext.h"

diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index 6dc8be492a2c424623de0dddc0006a1b0a242f7e..8029f3de53c46c743c20cd1ab98a9d67cf5f4cf9 100644 (file)
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "builtin.h"
 #include "config.h"
 #include "commit.h"
 #include "diff.h"
@@ -15,7 +15,6 @@
 #include "object-store.h"
 #include "pack.h"
 #include "pack-bitmap.h"
-#include "builtin.h"
 #include "log-tree.h"
 #include "graph.h"
 #include "bisect.h"

diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index ad93e5fad88c44a400601dc134ba34c0b5fb56d1..8d8c870421dc037da82f43f2d8c423d58fd8bb28 100644 (file)
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -4,7 +4,7 @@
  * Copyright (C) Linus Torvalds, 2005
  */
 #define USE_THE_INDEX_VARIABLE
-#include "cache.h"
+#include "builtin.h"
 #include "abspath.h"
 #include "alloc.h"
 #include "config.h"
@@ -14,7 +14,6 @@
 #include "hex.h"
 #include "refs.h"
 #include "quote.h"
-#include "builtin.h"
 #include "object-name.h"
 #include "parse-options.h"
 #include "diff.h"

diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index 46f4e0832ac6258e636f8064365811da6d55c449..99be9dc417d2a9152ccf82ab16c5102c11db71e9 100644 (file)
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -1,5 +1,4 @@
 #include "builtin.h"
-#include "cache.h"
 #include "config.h"
 #include "commit.h"
 #include "diff.h"

diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index 7ef4a642c17a63ba2060a1f5731c05a8d8d88a25..cd215f89af891a06743dcbd3c034c3bba294f558 100644 (file)
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "builtin.h"
 #include "config.h"
 #include "environment.h"
 #include "gettext.h"
@@ -6,7 +6,6 @@
 #include "hex.h"
 #include "pretty.h"
 #include "refs.h"
-#include "builtin.h"
 #include "color.h"
 #include "strvec.h"
 #include "object-name.h"

diff --git a/builtin/show-index.c b/builtin/show-index.c
index d839e55335d7a841f5d1b37887a2c963ac89e3c2..540dc3dad1c1e3e4308c5058151dfb1dcaee6d21 100644 (file)
--- a/builtin/show-index.c
+++ b/builtin/show-index.c
@@ -1,5 +1,4 @@
 #include "builtin.h"
-#include "cache.h"
 #include "gettext.h"
 #include "hash.h"
 #include "hex.h"

diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index a2243b42195b1b89c49a26f0c80b2bc09de142da..e07e9ca862fc7be01604191ffaa38c41c1ee94c6 100644 (file)
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@ -1,5 +1,4 @@
 #include "builtin.h"
-#include "cache.h"
 #include "config.h"
 #include "gettext.h"
 #include "hex.h"

diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c
index 40d420f06cb0c58e57b957f322dd0485b7669023..5c8ffb1f7598b056fadcdd8fb98182d34928e6f3 100644 (file)
--- a/builtin/sparse-checkout.c
+++ b/builtin/sparse-checkout.c
@@ -1,5 +1,4 @@
 #include "builtin.h"
-#include "cache.h"
 #include "config.h"
 #include "dir.h"
 #include "environment.h"

diff --git a/builtin/stripspace.c b/builtin/stripspace.c
index 9451eb69ff4771931118e948669114e9f3d4e63d..397d7fe2dcd1ce1ad36697b805a0ef990918ad8b 100644 (file)
--- a/builtin/stripspace.c
+++ b/builtin/stripspace.c
@@ -1,5 +1,4 @@
 #include "builtin.h"
-#include "cache.h"
 #include "config.h"
 #include "gettext.h"
 #include "parse-options.h"

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 02f295e741a4e59b9fef2237ba530b5383edb4af..12ba2ae45d06c61e99e4ce3321a380b82d8e2de7 100644 (file)
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -6,7 +6,6 @@
 #include "gettext.h"
 #include "hex.h"
 #include "repository.h"
-#include "cache.h"
 #include "config.h"
 #include "parse-options.h"
 #include "quote.h"

diff --git a/builtin/symbolic-ref.c b/builtin/symbolic-ref.c
index 10198a74faee55d0dfcfccb36b75c2e5bc5da8f5..a61fa3c0f812c6ce56348545c0033d86dd932e4f 100644 (file)
--- a/builtin/symbolic-ref.c
+++ b/builtin/symbolic-ref.c
@@ -1,6 +1,5 @@
 #include "builtin.h"
 #include "config.h"
-#include "cache.h"
 #include "gettext.h"
 #include "refs.h"
 #include "parse-options.h"

diff --git a/builtin/tag.c b/builtin/tag.c
index 49b64c7a2883b586015931869acf3878f33de299..26691e7e52652ab3d723828c9cd97ebbca2e471d 100644 (file)
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -6,10 +6,9 @@
  * Based on git-tag.sh and mktag.c by Linus Torvalds.
  */
 
-#include "cache.h"
+#include "builtin.h"
 #include "advice.h"
 #include "config.h"
-#include "builtin.h"
 #include "editor.h"
 #include "environment.h"
 #include "gettext.h"

diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index 2c52c3a741fbd49d7782f6388e2ebe38f54cb8fb..85baf6a131aa099f38ffa7745992ee4a817e3cf2 100644 (file)
--- a/builtin/unpack-objects.c
+++ b/builtin/unpack-objects.c
@@ -1,5 +1,4 @@
 #include "builtin.h"
-#include "cache.h"
 #include "bulk-checkin.h"
 #include "config.h"
 #include "environment.h"

diff --git a/builtin/update-index.c b/builtin/update-index.c
index 484a307df501d3d0d7ee4beb2ab07f7c910a4675..aee3cb8cbd3a03cedaf0c3e317e8c860049dbb74 100644 (file)
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -4,7 +4,7 @@
  * Copyright (C) Linus Torvalds, 2005
  */
 #define USE_THE_INDEX_VARIABLE
-#include "cache.h"
+#include "builtin.h"
 #include "bulk-checkin.h"
 #include "config.h"
 #include "environment.h"
@@ -15,7 +15,6 @@
 #include "quote.h"
 #include "cache-tree.h"
 #include "tree-walk.h"
-#include "builtin.h"
 #include "object-file.h"
 #include "refs.h"
 #include "resolve-undo.h"

diff --git a/builtin/update-ref.c b/builtin/update-ref.c
index 0c59b1c9eff0993821f49cd2de31eaf538733d6e..242102273eea02a096e7d4c31b5110d592f5d6af 100644 (file)
--- a/builtin/update-ref.c
+++ b/builtin/update-ref.c
@@ -1,9 +1,8 @@
-#include "cache.h"
+#include "builtin.h"
 #include "config.h"
 #include "gettext.h"
 #include "hash.h"
 #include "refs.h"
-#include "builtin.h"
 #include "object-name.h"
 #include "parse-options.h"
 #include "quote.h"

diff --git a/builtin/update-server-info.c b/builtin/update-server-info.c
index 19dce3c06552e2e3d120b27b4563ebadf02dc18c..1dc3971edeb3837a1479ce519197880d28ba7699 100644 (file)
--- a/builtin/update-server-info.c
+++ b/builtin/update-server-info.c
@@ -1,6 +1,5 @@
-#include "cache.h"
-#include "config.h"
 #include "builtin.h"
+#include "config.h"
 #include "gettext.h"
 #include "parse-options.h"
 #include "server-info.h"

diff --git a/builtin/upload-archive.c b/builtin/upload-archive.c
index 44ad400e183464fd3b90c74165ded03a3129962d..d4c7f162ff0bc241e64c8888d31b4ce3a4f8ceff 100644 (file)
--- a/builtin/upload-archive.c
+++ b/builtin/upload-archive.c
@@ -1,7 +1,6 @@
 /*
  * Copyright (c) 2006 Franck Bui-Huu
  */
-#include "cache.h"
 #include "builtin.h"
 #include "archive.h"
 #include "pkt-line.h"

diff --git a/builtin/upload-pack.c b/builtin/upload-pack.c
index beb9dd08610000f94d2365437e43bf0518c20c55..ba5103a93315c7b68363f69a9d3eea08653ce846 100644 (file)
--- a/builtin/upload-pack.c
+++ b/builtin/upload-pack.c
@@ -1,4 +1,3 @@
-#include "cache.h"
 #include "builtin.h"
 #include "exec-cmd.h"
 #include "gettext.h"

diff --git a/builtin/verify-commit.c b/builtin/verify-commit.c
index 5d99b82a64f65efcc673ee8da144748f5e62fc82..aa34fb896ace61d93716ac2b506a0f48e5a7ffd4 100644 (file)
--- a/builtin/verify-commit.c
+++ b/builtin/verify-commit.c
@@ -5,9 +5,8 @@
  *
  * Based on git-verify-tag
  */
-#include "cache.h"
-#include "config.h"
 #include "builtin.h"
+#include "config.h"
 #include "gettext.h"
 #include "object-name.h"
 #include "object-store.h"

diff --git a/builtin/verify-pack.c b/builtin/verify-pack.c
index 190fd6954092fe16f5e5e59dc01ba10445f30d45..aba92cf8af7325630996c31f051aa2e22a1cfff6 100644 (file)
--- a/builtin/verify-pack.c
+++ b/builtin/verify-pack.c
@@ -1,5 +1,4 @@
 #include "builtin.h"
-#include "cache.h"
 #include "config.h"
 #include "gettext.h"
 #include "run-command.h"

diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c
index c6019a0ad8cf79f92df9e1e443df373516f67db9..d8753270ebee4df6eed4b2dd5037f3fee97eb2c6 100644 (file)
--- a/builtin/verify-tag.c
+++ b/builtin/verify-tag.c
@@ -5,9 +5,8 @@
  *
  * Based on git-verify-tag.sh
  */
-#include "cache.h"
-#include "config.h"
 #include "builtin.h"
+#include "config.h"
 #include "gettext.h"
 #include "tag.h"
 #include "run-command.h"

diff --git a/builtin/worktree.c b/builtin/worktree.c
index efe520fe9544b1361dfc2ba8c40955565545c9aa..2d83ea4bf28cc0503bb4f3f741969485d92bf3ca 100644 (file)
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -1,9 +1,8 @@
-#include "cache.h"
+#include "builtin.h"
 #include "abspath.h"
 #include "checkout.h"
 #include "config.h"
 #include "copy.h"
-#include "builtin.h"
 #include "dir.h"
 #include "environment.h"
 #include "gettext.h"

diff --git a/builtin/write-tree.c b/builtin/write-tree.c
index 84b83318c967d1401792a99ca85ca433812e6885..66e83d0ecba04c90d1e12a2529cc40210808035c 100644 (file)
--- a/builtin/write-tree.c
+++ b/builtin/write-tree.c
@@ -5,7 +5,6 @@
  */
 #define USE_THE_INDEX_VARIABLE
 #include "builtin.h"
-#include "cache.h"
 #include "config.h"
 #include "environment.h"
 #include "gettext.h"

diff --git a/cache-tree.c b/cache-tree.c
index 153217b47ff5ed3e334531ba6060cb646fe38c4c..077932c2db519a439b7af19dff7c874b59194274 100644 (file)
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "alloc.h"
 #include "environment.h"
 #include "hex.h"

diff --git a/cache.h b/cache.h
deleted file mode 100644 (file)
index 9b4e8d1..0000000
--- a/cache.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef CACHE_H
-#define CACHE_H
-
-#include "git-compat-util.h"
-
-#endif /* CACHE_H */

diff --git a/compat/fsmonitor/fsm-health-win32.c b/compat/fsmonitor/fsm-health-win32.c
index fe11bdd9ce6d3bbe96f6fdec7c6b417b96cc680b..6c81d7ee5c22b00355347705a6ee9ec3fbdb235c 100644 (file)
--- a/compat/fsmonitor/fsm-health-win32.c
+++ b/compat/fsmonitor/fsm-health-win32.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "config.h"
 #include "fsmonitor.h"
 #include "fsm-health.h"

diff --git a/compat/fsmonitor/fsm-listen-win32.c b/compat/fsmonitor/fsm-listen-win32.c
index 677b1bbdecac2e82b03c3755af4dfa0de562f73d..3c0df5cff8c66bac51c0abb7396abc91c0f60936 100644 (file)
--- a/compat/fsmonitor/fsm-listen-win32.c
+++ b/compat/fsmonitor/fsm-listen-win32.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "config.h"
 #include "fsmonitor.h"
 #include "fsm-listen.h"

diff --git a/compat/fsmonitor/fsm-path-utils-darwin.c b/compat/fsmonitor/fsm-path-utils-darwin.c
index 45eb4a9b9e75552cf124e050b5cfdd06cda46a2d..ef0142e0fbf5cfd2c73a34ea3c48cb1438d202d6 100644 (file)
--- a/compat/fsmonitor/fsm-path-utils-darwin.c
+++ b/compat/fsmonitor/fsm-path-utils-darwin.c
@@ -1,3 +1,4 @@
+#include "git-compat-util.h"
 #include "fsmonitor.h"
 #include "fsmonitor-path-utils.h"
 #include "gettext.h"

diff --git a/compat/fsmonitor/fsm-path-utils-win32.c b/compat/fsmonitor/fsm-path-utils-win32.c
index 4024baafb9768f953b43c48ce247cb12ed3766c3..27bb69451835a1918f6c1fef8b006c66838a946a 100644 (file)
--- a/compat/fsmonitor/fsm-path-utils-win32.c
+++ b/compat/fsmonitor/fsm-path-utils-win32.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "fsmonitor.h"
 #include "fsmonitor-path-utils.h"
 #include "gettext.h"

diff --git a/compat/fsmonitor/fsm-settings-win32.c b/compat/fsmonitor/fsm-settings-win32.c
index a8af31b71de05cab939c1d8223194fa91d0cbd6a..37288978643d7e327e8c3444e4e63fddaa4ab1c8 100644 (file)
--- a/compat/fsmonitor/fsm-settings-win32.c
+++ b/compat/fsmonitor/fsm-settings-win32.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "config.h"
 #include "repository.h"
 #include "fsmonitor.h"

diff --git a/compat/mingw.c b/compat/mingw.c
index d06cdc6254fbc34eabcd1130c08ae6b8f1fcae01..559abb1c6172a9aaa4f518dfc6c1ce13d34f7c2f 100644 (file)
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -6,7 +6,6 @@
 #include <wchar.h>
 #include "../strbuf.h"
 #include "../run-command.h"
-#include "../cache.h"
 #include "../abspath.h"
 #include "../alloc.h"
 #include "win32/lazyload.h"

diff --git a/compat/precompose_utf8.c b/compat/precompose_utf8.c
index fb08475bc6434566f6aeb46563896fcac7a73e6c..0bd5c24250a4fb717f61db6e03e40326ca1fad07 100644 (file)
--- a/compat/precompose_utf8.c
+++ b/compat/precompose_utf8.c
@@ -5,7 +5,7 @@
 
 #define PRECOMPOSE_UNICODE_C
 
-#include "cache.h"
+#include "git-compat-util.h"
 #include "config.h"
 #include "environment.h"
 #include "gettext.h"

diff --git a/compat/sha1-chunked.c b/compat/sha1-chunked.c
index 56729d92dcf17dd37fd36b5192eab87a0118603c..a4a6f930d7b14a473d5e47a9a90b84a7557054af 100644 (file)
--- a/compat/sha1-chunked.c
+++ b/compat/sha1-chunked.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "hash-ll.h"
 
 int git_SHA1_Update_Chunked(platform_SHA_CTX *c, const void *data, size_t len)

diff --git a/compat/simple-ipc/ipc-win32.c b/compat/simple-ipc/ipc-win32.c
index 6adce3c650eba5b8ae4879b5c32b79c3849c3d95..8bfe51248e552e6915acec34abea31a3d3dc279e 100644 (file)
--- a/compat/simple-ipc/ipc-win32.c
+++ b/compat/simple-ipc/ipc-win32.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "abspath.h"
 #include "gettext.h"
 #include "simple-ipc.h"

diff --git a/compat/win32/trace2_win32_process_info.c b/compat/win32/trace2_win32_process_info.c
index a4e33768f432d329746508853fe6021ed91f48a6..a2b1506f9c9bb94ed8fa6e7355c98a63811e7e94 100644 (file)
--- a/compat/win32/trace2_win32_process_info.c
+++ b/compat/win32/trace2_win32_process_info.c
@@ -1,4 +1,4 @@
-#include "../../cache.h"
+#include "../../git-compat-util.h"
 #include "../../json-writer.h"
 #include "../../repository.h"
 #include "../../trace2.h"

diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
index 2f6e0197ffa489ccc14b0665cdf78dba43b39e3e..4faa419cc3d506cedaf1b0bc1773eeef58f31dab 100644 (file)
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -227,7 +227,7 @@ add_compile_definitions(GIT_HOST_CPU="${CMAKE_SYSTEM_PROCESSOR}")
 add_compile_definitions(SHA256_BLK INTERNAL_QSORT RUNTIME_PREFIX)
 add_compile_definitions(NO_OPENSSL SHA1_DC SHA1DC_NO_STANDARD_INCLUDES
                        SHA1DC_INIT_SAFE_HASH_DEFAULT=0
-                       SHA1DC_CUSTOM_INCLUDE_SHA1_C="cache.h"
+                       SHA1DC_CUSTOM_INCLUDE_SHA1_C="git-compat-util.h"
                        SHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="git-compat-util.h" )
 list(APPEND compat_SOURCES sha1dc_git.c sha1dc/sha1.c sha1dc/ubc_check.c block-sha1/sha1.c sha256/block/sha256.c compat/qsort_s.c)
 

diff --git a/convert.c b/convert.c
index b421065f212b12d1e4b14f58817c94a8a7485ab2..89aeb9e72b9e483c676af97a9d7e7c632fe3a8fa 100644 (file)
--- a/convert.c
+++ b/convert.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "advice.h"
 #include "config.h"
 #include "convert.h"

diff --git a/diff-lib.c b/diff-lib.c
index 36cd66ea237581ebe3dab5b3c5b0b5f45f5d397f..f3aa7f93c783cca279eb188828daa7a300d6d0ff 100644 (file)
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2005 Junio C Hamano
  */
-#include "cache.h"
+#include "git-compat-util.h"
 #include "quote.h"
 #include "commit.h"
 #include "diff.h"

diff --git a/diff.c b/diff.c
index a72811ee5de75c5ebddf9fb1769456c3274f899b..7fb9abe8915ffb9c8d4cbfef97cb676a153b3726 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2005 Junio C Hamano
  */
-#include "cache.h"
+#include "git-compat-util.h"
 #include "abspath.h"
 #include "alloc.h"
 #include "base85.h"

diff --git a/entry.c b/entry.c
index 53d00386748cc5ad44f0986972d59f8f87b0fa96..041f5cf212dfc4b9e45d28e8cb765e19d670e56f 100644 (file)
--- a/entry.c
+++ b/entry.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "blob.h"
 #include "object-store.h"
 #include "dir.h"

diff --git a/environment.c b/environment.c
index 6bd001efbdec671cc5a8749725ab01fd90592749..4ecad41bb9bcd946cec2a08d7c4cc9d8e26c68bb 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -109,7 +109,7 @@ char *git_work_tree_cfg;
 static char *git_namespace;
 
 /*
- * Repository-local GIT_* environment variables; see cache.h for details.
+ * Repository-local GIT_* environment variables; see environment.h for details.
  */
 const char * const local_repo_env[] = {
        ALTERNATE_DB_ENVIRONMENT,

diff --git a/fsmonitor-ipc.c b/fsmonitor-ipc.c
index 6a6a89764a6e5c3d9059bbfeb8580df43a33e93a..6ace978a1b400b06bfcab91608c5e35ba23726f1 100644 (file)
--- a/fsmonitor-ipc.c
+++ b/fsmonitor-ipc.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "fsmonitor.h"
 #include "gettext.h"
 #include "simple-ipc.h"

diff --git a/fsmonitor.c b/fsmonitor.c
index 28c083d4d8417404bcf4efca872ac1106cf4a925..f670c50937898342f693708c706a0db270be3a6d 100644 (file)
--- a/fsmonitor.c
+++ b/fsmonitor.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "config.h"
 #include "dir.h"
 #include "environment.h"

diff --git a/fsmonitor.h b/fsmonitor.h
index 8b7a521552ab057108739c06fcb45911aadf787c..7702301d214a413496b298fbbb6e788c108fb5ad 100644 (file)
--- a/fsmonitor.h
+++ b/fsmonitor.h
@@ -1,7 +1,6 @@
 #ifndef FSMONITOR_H
 #define FSMONITOR_H
 
-#include "cache.h"
 #include "dir.h"
 #include "fsmonitor-settings.h"
 #include "object.h"

diff --git a/hash-lookup.c b/hash-lookup.c
index 8fec8939fd3474b4e6c8058fe81f89c1ff45cf41..9f0f95e2b9e0c44e79bfe6ee3ec43b61e7991f4a 100644 (file)
--- a/hash-lookup.c
+++ b/hash-lookup.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "hash.h"
 #include "hash-lookup.h"
 #include "read-cache-ll.h"

diff --git a/merge-ort-wrappers.c b/merge-ort-wrappers.c
index a0bedcb63bbaa8f850a7da52ff371a68eb7ff3e1..4acedf3c3386d7c9c2e57eebabddb1fe9ec27331 100644 (file)
--- a/merge-ort-wrappers.c
+++ b/merge-ort-wrappers.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "gettext.h"
 #include "hash.h"
 #include "merge-ort.h"

diff --git a/merge-ort.c b/merge-ort.c
index 17167f56dc7400d3708cc91a0ffd355acf72ef05..12d0181f4a479fb08de342ed64bf2e2f45d1635b 100644 (file)
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -14,7 +14,7 @@
  * "cale", "peedy", or "ins" instead of "ort"?)
  */
 
-#include "cache.h"
+#include "git-compat-util.h"
 #include "merge-ort.h"
 
 #include "alloc.h"

diff --git a/merge-recursive.c b/merge-recursive.c
index 0e16e7a06df0b84fce8795f3912c76938bc18289..4bef9b62fa82ad538d519436d40b9c3f8f027e1c 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -3,7 +3,7 @@
  * Fredrik Kuivinen.
  * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
  */
-#include "cache.h"
+#include "git-compat-util.h"
 #include "merge-recursive.h"
 
 #include "advice.h"

diff --git a/merge.c b/merge.c
index fade6b203b3e351ca41732d412c07c823dbbe46d..83bcba6943eee91155c45d7d5c5bf412d7b7acc8 100644 (file)
--- a/merge.c
+++ b/merge.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "diff.h"
 #include "diffcore.h"
 #include "gettext.h"

diff --git a/name-hash.c b/name-hash.c
index f2f3564cb2081a5077b62d3b08cf4129b12b98a0..251f036eef6983a66ac13013e5bee3ef770e8f9f 100644 (file)
--- a/name-hash.c
+++ b/name-hash.c
@@ -5,7 +5,7 @@
  *
  * Copyright (C) 2008 Linus Torvalds
  */
-#include "cache.h"
+#include "git-compat-util.h"
 #include "environment.h"
 #include "gettext.h"
 #include "name-hash.h"

diff --git a/object-name.c b/object-name.c
index 1eefeef746eb0c76bfd5a5d3e0fa928d530d483a..45f4d51305bdd2f500ac39f95c846c2e8c005fac 100644 (file)
--- a/object-name.c
+++ b/object-name.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "object-name.h"
 #include "advice.h"
 #include "config.h"

diff --git a/object.c b/object.c
index 333e736fb24f9759016ff617f9f6dd835f6d4dc6..60f954194f771f510dccae01a66ec00723b0dfb2 100644 (file)
--- a/object.c
+++ b/object.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "gettext.h"
 #include "hex.h"
 #include "object.h"

diff --git a/parallel-checkout.c b/parallel-checkout.c
index 2b1439c0c5f906c7dc2cd9a3fe1a864dc85bb1ec..602fbf19d3c0d38fb5b191f139a121584b6dc6db 100644 (file)
--- a/parallel-checkout.c
+++ b/parallel-checkout.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "alloc.h"
 #include "config.h"
 #include "entry.h"

diff --git a/pathspec.c b/pathspec.c
index f52ce60e41a932f2f6cd1528caab450b79a12908..8932b05a264b9d325a5c522f086131a60baa2c3e 100644 (file)
--- a/pathspec.c
+++ b/pathspec.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "abspath.h"
 #include "config.h"
 #include "dir.h"

diff --git a/preload-index.c b/preload-index.c
index d037a951efa927bc4d091b2d7fd71faf9295ef32..e44530c80cf51edfdff846ed476a16c9bae0047a 100644 (file)
--- a/preload-index.c
+++ b/preload-index.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2008 Linus Torvalds
  */
-#include "cache.h"
+#include "git-compat-util.h"
 #include "pathspec.h"
 #include "dir.h"
 #include "environment.h"

diff --git a/read-cache.c b/read-cache.c
index 42f27b066424c8d138593fe3fadd4bea67070e59..edab96765dfc416a3a225ffea0a0b419940ca732 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) Linus Torvalds, 2005
  */
-#include "cache.h"
+#include "git-compat-util.h"
 #include "alloc.h"
 #include "bulk-checkin.h"
 #include "config.h"

diff --git a/refs/files-backend.c b/refs/files-backend.c
index 9a8333c0d0708cae4766c6d766ea834f09f01ef3..9223c7f5f41c9be4ffcc6e7fe241e0ca0a9af55a 100644 (file)
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1,4 +1,4 @@
-#include "../cache.h"
+#include "../git-compat-util.h"
 #include "../config.h"
 #include "../copy.h"
 #include "../environment.h"

diff --git a/refs/packed-backend.c b/refs/packed-backend.c
index f21882cc2e90612fe4df28a3ed10a75f0744b4f7..27bd6339ff37d0dbe3d6e6bf67eb704624c90638 100644 (file)
--- a/refs/packed-backend.c
+++ b/refs/packed-backend.c
@@ -1,4 +1,4 @@
-#include "../cache.h"
+#include "../git-compat-util.h"
 #include "../alloc.h"
 #include "../config.h"
 #include "../gettext.h"

diff --git a/repository.c b/repository.c
index 3d799150b45285d34cb4f8e9e35392e6f2265eb1..2616aabde50063794e6e1070a66cf0af6f6d494e 100644 (file)
--- a/repository.c
+++ b/repository.c
@@ -3,7 +3,7 @@
  * declaration matches the definition in this file.
  */
 #define USE_THE_INDEX_VARIABLE
-#include "cache.h"
+#include "git-compat-util.h"
 #include "abspath.h"
 #include "repository.h"
 #include "object-store.h"

diff --git a/rerere.c b/rerere.c
index 3bc9aedc286796914ebd2a83ed1cc52fa4d0ec10..2fb93a51125feafe66fcebf8fa9b5452a9d42e25 100644 (file)
--- a/rerere.c
+++ b/rerere.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/resolve-undo.c b/resolve-undo.c
index 595988778410864950663bd642aae4e867900f90..7817f5d6db178519c23b4eea66785820cb4315ca 100644 (file)
--- a/resolve-undo.c
+++ b/resolve-undo.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "dir.h"
 #include "hash.h"
 #include "read-cache.h"

diff --git a/revision.c b/revision.c
index 8d37ec9f495816ecfebcfde70e5ba0c349793a5c..66a1fece0df29b054fa4873380496c1147465ad2 100644 (file)
--- a/revision.c
+++ b/revision.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/run-command.h b/run-command.h
index 9e47f91d462c34ab55a0829afb1ed9f4d4261427..1f22cc3827d7d0c53119d085c3ef53a6ab3c36fd 100644 (file)
--- a/run-command.h
+++ b/run-command.h
@@ -503,7 +503,7 @@ void run_processes_parallel(const struct run_process_parallel_opts *opts);
  * exception of GIT_CONFIG_PARAMETERS and GIT_CONFIG_COUNT (which cause the
  * corresponding environment variables to be unset in the subprocess) and adds
  * an environment variable pointing to new_git_dir. See local_repo_env in
- * cache.h for more information.
+ * environment.h for more information.
  */
 void prepare_other_repo_env(struct strvec *env, const char *new_git_dir);
 

diff --git a/sequencer.c b/sequencer.c
index bdcf2cc6d9dd0c276a9b531744ae2ac0bb83c860..efad20b753f0ef2167e8d1c454ee3d9dff893f1f 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "abspath.h"
 #include "advice.h"
 #include "alloc.h"

diff --git a/shallow.c b/shallow.c
index a2ebf0af2ba611d565eeb586f7e28f27e43da874..f1c93e74648cb25ac3d799abeb45878d7b021d9d 100644 (file)
--- a/shallow.c
+++ b/shallow.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "alloc.h"
 #include "hex.h"
 #include "repository.h"

diff --git a/sparse-index.c b/sparse-index.c
index 60451daae80d9bb344b4b27d317ae6212a11cc8b..2c47954d933761756a15dec307e6d0b4fffa81f5 100644 (file)
--- a/sparse-index.c
+++ b/sparse-index.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/split-index.c b/split-index.c
index 0a8d3903d6f57c94a39d9f9ecf04df5059d4166c..0ee3865a553ae2676d6bf79279d221a8f000ee42 100644 (file)
--- a/split-index.c
+++ b/split-index.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "alloc.h"
 #include "gettext.h"
 #include "hash.h"

diff --git a/strbuf.h b/strbuf.h
index 3dfeadb44c2e93e3e47cd448eaf8fd9133ac47bc..e8dfab6ecd6f41a3aea43590f3ccd1af82119b61 100644 (file)
--- a/strbuf.h
+++ b/strbuf.h
@@ -72,10 +72,6 @@ struct strbuf {
 extern char strbuf_slopbuf[];
 #define STRBUF_INIT  { .buf = strbuf_slopbuf }
 
-/*
- * Predeclare this here, since cache.h includes this file before it defines the
- * struct.
- */
 struct object_id;
 
 /**

diff --git a/submodule.c b/submodule.c
index e09722d6be376ede5121d41ddd5bbcdeca089a85..20aa8ed0fb8dc218be9bf23d3fdfd8aebcf82537 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "abspath.h"
 #include "alloc.h"
 #include "repository.h"

diff --git a/t/helper/test-cache-tree.c b/t/helper/test-cache-tree.c
index 9d64422b3cc23621c0a02b5ff359d7123ca41936..e7236392c8132a3720f55148d6c2acbf5de01a41 100644 (file)
--- a/t/helper/test-cache-tree.c
+++ b/t/helper/test-cache-tree.c
@@ -1,6 +1,5 @@
 #define USE_THE_INDEX_VARIABLE
 #include "test-tool.h"
-#include "cache.h"
 #include "gettext.h"
 #include "hex.h"
 #include "tree.h"

diff --git a/t/helper/test-dump-cache-tree.c b/t/helper/test-dump-cache-tree.c
index 78aa11bb194fe647cf88c029763fed2a87477533..c38f546e4f096fbd3e9b6cb13ab96bb800f56504 100644 (file)
--- a/t/helper/test-dump-cache-tree.c
+++ b/t/helper/test-dump-cache-tree.c
@@ -1,6 +1,5 @@
 #define USE_THE_INDEX_VARIABLE
 #include "test-tool.h"
-#include "cache.h"
 #include "hash.h"
 #include "hex.h"
 #include "tree.h"

diff --git a/t/helper/test-dump-fsmonitor.c b/t/helper/test-dump-fsmonitor.c
index e4357d65ec568b4db214f34e4f52035c77e3f336..4f215fea025290f868defcae8bdca5aeefc627ba 100644 (file)
--- a/t/helper/test-dump-fsmonitor.c
+++ b/t/helper/test-dump-fsmonitor.c
@@ -1,5 +1,4 @@
 #include "test-tool.h"
-#include "cache.h"
 #include "read-cache-ll.h"
 #include "repository.h"
 #include "setup.h"

diff --git a/t/helper/test-dump-split-index.c b/t/helper/test-dump-split-index.c
index 59a24a842b4ea635c7ae040a082dffedfdfd97ae..5cf0b26dca1f397a6e7b2d6662ec669583d35a66 100644 (file)
--- a/t/helper/test-dump-split-index.c
+++ b/t/helper/test-dump-split-index.c
@@ -1,6 +1,5 @@
 #define USE_THE_INDEX_VARIABLE
 #include "test-tool.h"
-#include "cache.h"
 #include "hex.h"
 #include "read-cache-ll.h"
 #include "repository.h"

diff --git a/t/helper/test-dump-untracked-cache.c b/t/helper/test-dump-untracked-cache.c
index a1cbafd64f33004dcf37c18c9f4d583d1a7268e6..b4af9712fe5f2cfb815e22dc41a588890faecea5 100644 (file)
--- a/t/helper/test-dump-untracked-cache.c
+++ b/t/helper/test-dump-untracked-cache.c
@@ -1,6 +1,5 @@
 #define USE_THE_INDEX_VARIABLE
 #include "test-tool.h"
-#include "cache.h"
 #include "dir.h"
 #include "hex.h"
 #include "read-cache-ll.h"

diff --git a/t/helper/test-fast-rebase.c b/t/helper/test-fast-rebase.c
index cbcf2419f9bdb0eb3722bf9eb46995dd989f0397..62c5b5d704b98ea781856a14c293c3dd810846e2 100644 (file)
--- a/t/helper/test-fast-rebase.c
+++ b/t/helper/test-fast-rebase.c
@@ -12,7 +12,6 @@
 
 #define USE_THE_INDEX_VARIABLE
 #include "test-tool.h"
-#include "cache.h"
 #include "cache-tree.h"
 #include "commit.h"
 #include "environment.h"

diff --git a/t/helper/test-fsmonitor-client.c b/t/helper/test-fsmonitor-client.c
index 386f4cdaee5f1d8d672e104d7fc7a8218281eae5..58d1dc5fc8344741737a605288a7af63b3ca2341 100644 (file)
--- a/t/helper/test-fsmonitor-client.c
+++ b/t/helper/test-fsmonitor-client.c
@@ -4,7 +4,6 @@
  */
 
 #include "test-tool.h"
-#include "cache.h"
 #include "parse-options.h"
 #include "fsmonitor-ipc.h"
 #include "read-cache-ll.h"

diff --git a/t/helper/test-hash-speed.c b/t/helper/test-hash-speed.c
index c1e82d5d0280ad985906498fc8c430b349dd7dfd..b235da594f749b1a6b680d0b674c5bb822b1b978 100644 (file)
--- a/t/helper/test-hash-speed.c
+++ b/t/helper/test-hash-speed.c
@@ -1,5 +1,4 @@
 #include "test-tool.h"
-#include "cache.h"
 #include "hash-ll.h"
 
 #define NUM_SECONDS 3

diff --git a/t/helper/test-index-version.c b/t/helper/test-index-version.c
index b3cbaf6d2a8a6ab6caef991718876fd383c3e970..f3c2dbe0a2ca512beff2821715d65bd625b3126a 100644 (file)
--- a/t/helper/test-index-version.c
+++ b/t/helper/test-index-version.c
@@ -1,5 +1,4 @@
 #include "test-tool.h"
-#include "cache.h"
 #include "read-cache-ll.h"
 
 int cmd__index_version(int argc UNUSED, const char **argv UNUSED)

diff --git a/t/helper/test-lazy-init-name-hash.c b/t/helper/test-lazy-init-name-hash.c
index 8eb327b3b9371d56856b1aa162609cbdb8c42315..187a115d5743f39f7b93e0bf128ead62262a12bb 100644 (file)
--- a/t/helper/test-lazy-init-name-hash.c
+++ b/t/helper/test-lazy-init-name-hash.c
@@ -1,6 +1,5 @@
 #define USE_THE_INDEX_VARIABLE
 #include "test-tool.h"
-#include "cache.h"
 #include "environment.h"
 #include "name-hash.h"
 #include "parse-options.h"

diff --git a/t/helper/test-path-utils.c b/t/helper/test-path-utils.c
index 90e4d29a06f1dc7f820065ef1c40512609fc6a55..70396fa38454e86d661b9a4857e3ef463ee40f63 100644 (file)
--- a/t/helper/test-path-utils.c
+++ b/t/helper/test-path-utils.c
@@ -1,5 +1,4 @@
 #include "test-tool.h"
-#include "cache.h"
 #include "abspath.h"
 #include "environment.h"
 #include "path.h"

diff --git a/t/helper/test-read-cache.c b/t/helper/test-read-cache.c
index 0d548814e08a7405150afe441d7d88839dfa6648..56c2d25f3597c24c9562222921f71a4396584a90 100644 (file)
--- a/t/helper/test-read-cache.c
+++ b/t/helper/test-read-cache.c
@@ -1,6 +1,5 @@
 #define USE_THE_INDEX_VARIABLE
 #include "test-tool.h"
-#include "cache.h"
 #include "config.h"
 #include "read-cache-ll.h"
 #include "repository.h"

diff --git a/t/helper/test-scrap-cache-tree.c b/t/helper/test-scrap-cache-tree.c
index 7b7e23840435163555668ec5d3041f60dd65895f..0a816a96e28b6c43a0b4927418c97bb11ba5298c 100644 (file)
--- a/t/helper/test-scrap-cache-tree.c
+++ b/t/helper/test-scrap-cache-tree.c
@@ -1,6 +1,5 @@
 #define USE_THE_INDEX_VARIABLE
 #include "test-tool.h"
-#include "cache.h"
 #include "lockfile.h"
 #include "read-cache-ll.h"
 #include "repository.h"

diff --git a/t/helper/test-sha1.c b/t/helper/test-sha1.c
index dc6fb17f2a77b8ef99bdd9ac9956889d39d9073c..dcb7f6c0032b556959c6635db3c89fd49e8790d0 100644 (file)
--- a/t/helper/test-sha1.c
+++ b/t/helper/test-sha1.c
@@ -1,5 +1,4 @@
 #include "test-tool.h"
-#include "cache.h"
 #include "hash-ll.h"
 
 int cmd__sha1(int ac, const char **av)

diff --git a/t/helper/test-sha256.c b/t/helper/test-sha256.c
index f50f64f1f221acadb2e4ebb2b856a05a1a2810e5..08cf14900140d37733e5afcad7c9fdc97c3b7eae 100644 (file)
--- a/t/helper/test-sha256.c
+++ b/t/helper/test-sha256.c
@@ -1,5 +1,4 @@
 #include "test-tool.h"
-#include "cache.h"
 #include "hash-ll.h"
 
 int cmd__sha256(int ac, const char **av)

diff --git a/t/helper/test-strcmp-offset.c b/t/helper/test-strcmp-offset.c
index d3f39207f14ee6db5313c4389872f9edd7132db0..d8473cf2fcfeb61bdbced865455dd2e3a35b71bb 100644 (file)
--- a/t/helper/test-strcmp-offset.c
+++ b/t/helper/test-strcmp-offset.c
@@ -1,5 +1,4 @@
 #include "test-tool.h"
-#include "cache.h"
 #include "read-cache-ll.h"
 
 int cmd__strcmp_offset(int argc UNUSED, const char **argv)

diff --git a/t/helper/test-write-cache.c b/t/helper/test-write-cache.c
index d27125eeacf6554c55ee7b964f6afd8596e05e34..f084034d38e0328e0792d096225c31ddd91d74c7 100644 (file)
--- a/t/helper/test-write-cache.c
+++ b/t/helper/test-write-cache.c
@@ -1,6 +1,5 @@
 #define USE_THE_INDEX_VARIABLE
 #include "test-tool.h"
-#include "cache.h"
 #include "lockfile.h"
 #include "read-cache-ll.h"
 #include "repository.h"

diff --git a/unpack-trees.c b/unpack-trees.c
index fdcc46e474f5aa8a94a871f96f2baf0448e443e0..4b620df30314570ec5cf6f0d7800b197f3238e15 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "advice.h"
 #include "strvec.h"
 #include "repository.h"

diff --git a/wt-status.c b/wt-status.c
index 847b63c906ea9d6b952acad6895edd2fef5fe63a..6ee8567ac2d4a43ae8d7e369cf4df4b73b01da6e 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "advice.h"
 #include "wt-status.h"
 #include "object.h"