sparse-index.h: move declarations for sparse-index.c from cache.h

Note in particular that this reverses the decision made in 118a2e8bde0
("cache: move ensure_full_index() to cache.h", 2021-04-01).

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

diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c
index 9375a05539f3613efc354abf007d63cdce09ecd8..b1cd8bef2647997bd8c2456e40f72e2087673f4c 100644 (file)
--- a/builtin/checkout-index.c
+++ b/builtin/checkout-index.c
@@ -17,6 +17,7 @@
 #include "entry.h"
 #include "parallel-checkout.h"
 #include "setup.h"
+#include "sparse-index.h"
 
 #define CHECKOUT_ALL 4
 static int nul_term_line;

diff --git a/builtin/commit.c b/builtin/commit.c
index f3a1d3eb7361cbc440442d88bfd17e46f76b688d..ee296e5ec6e595b8c7aca61a350bdd716f86c6b5 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -38,6 +38,7 @@
 #include "gpg-interface.h"
 #include "column.h"
 #include "sequencer.h"
+#include "sparse-index.h"
 #include "mailmap.h"
 #include "help.h"
 #include "commit-reach.h"

diff --git a/builtin/difftool.c b/builtin/difftool.c
index 0049342f5c0daf79f6818ac6dea89a8ea7692d8a..2c27a59e04a99c9be237e57b2bea430090f5589a 100644 (file)
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -23,6 +23,7 @@
 #include "gettext.h"
 #include "hex.h"
 #include "parse-options.h"
+#include "sparse-index.h"
 #include "strvec.h"
 #include "strbuf.h"
 #include "lockfile.h"

diff --git a/builtin/fsck.c b/builtin/fsck.c
index dcc165bf0c508da9b0ebe238a83fc5861def40c7..712e3dc68c5f96a83e3628e1b774fbb5178f9bdc 100644 (file)
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -25,6 +25,7 @@
 #include "replace-object.h"
 #include "resolve-undo.h"
 #include "run-command.h"
+#include "sparse-index.h"
 #include "worktree.h"
 #include "pack-revindex.h"
 #include "pack-bitmap.h"

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index eb7cce4e6efb1dd9879d3f872cb9c0fefa6a1ef8..b6238966d253108b64885741d790d21c49c62928 100644 (file)
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -23,6 +23,7 @@
 #include "pathspec.h"
 #include "run-command.h"
 #include "setup.h"
+#include "sparse-index.h"
 #include "submodule.h"
 #include "submodule-config.h"
 #include "object-store.h"

diff --git a/builtin/merge-index.c b/builtin/merge-index.c
index ab16e70f23d532d769f074312352d15ead4ae893..d16e8aa414b17132bacece1023f6cbc4284aba5e 100644 (file)
--- a/builtin/merge-index.c
+++ b/builtin/merge-index.c
@@ -3,6 +3,7 @@
 #include "hex.h"
 #include "repository.h"
 #include "run-command.h"
+#include "sparse-index.h"
 
 static const char *pgm;
 static int one_shot, quiet;

diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index 440f19b1b8759a0852bb9c244fb79536ee94f859..bd1ce1d963ffbd0f7741151a3663b35d299d598c 100644 (file)
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -22,6 +22,7 @@
 #include "repository.h"
 #include "resolve-undo.h"
 #include "setup.h"
+#include "sparse-index.h"
 #include "submodule.h"
 #include "submodule-config.h"
 

diff --git a/builtin/reset.c b/builtin/reset.c
index f99f32d5802fc537441982e45ec6539cc0241e94..3dc41ac332743b272bef42a73ae5f3e844219fe2 100644 (file)
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -29,6 +29,7 @@
 #include "unpack-trees.h"
 #include "cache-tree.h"
 #include "setup.h"
+#include "sparse-index.h"
 #include "submodule.h"
 #include "submodule-config.h"
 #include "trace.h"

diff --git a/builtin/rm.c b/builtin/rm.c
index b4589c824c00d4abbf5b63b7df561a9369e64835..377a0f66ad8156fb33b5486c3aa790f9463d8baa 100644 (file)
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -19,6 +19,7 @@
 #include "repository.h"
 #include "string-list.h"
 #include "setup.h"
+#include "sparse-index.h"
 #include "submodule.h"
 #include "pathspec.h"
 

diff --git a/builtin/stash.c b/builtin/stash.c
index a7e17ffe3844a5b5567450c61a830e18de4b1361..8856ac6d5c7fdb46bfb11eebd86d53ffe26fe6c5 100644 (file)
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -20,6 +20,7 @@
 #include "rerere.h"
 #include "revision.h"
 #include "setup.h"
+#include "sparse-index.h"
 #include "log-tree.h"
 #include "diffcore.h"
 #include "exec-cmd.h"

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 6a16208e8a8c34d60a0b1e64d1386d45acb4dea4..fa309595359796820137b1edfcf17aa859fb2348 100644 (file)
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -13,6 +13,7 @@
 #include "pathspec.h"
 #include "dir.h"
 #include "setup.h"
+#include "sparse-index.h"
 #include "submodule.h"
 #include "submodule-config.h"
 #include "string-list.h"

diff --git a/builtin/update-index.c b/builtin/update-index.c
index 5fab9ad2ec46fda2f114a64ad16933126b37e85c..47dc9b626ef334da8daaf6731517f23067684ff0 100644 (file)
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -24,6 +24,7 @@
 #include "dir.h"
 #include "repository.h"
 #include "setup.h"
+#include "sparse-index.h"
 #include "split-index.h"
 #include "symlinks.h"
 #include "fsmonitor.h"

diff --git a/cache.h b/cache.h
index 316904da3920ce86db1fb626fe279eee6a3baa72..79daaa166b1258a629052b60e6564bef870729f9 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -327,8 +327,6 @@ int read_index_from(struct index_state *, const char *path,
                    const char *gitdir);
 int is_index_unborn(struct index_state *);
 
-void ensure_full_index(struct index_state *istate);
-
 /* For use with `write_locked_index()`. */
 #define COMMIT_LOCK            (1 << 0)
 #define SKIP_IF_UNCHANGED      (1 << 1)

diff --git a/dir.c b/dir.c
index 029aab36fe8cbe78f36bfd0e449b866a3f94baf7..1e84b1e1f28a37a610942d8960988f3704fbb9b0 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -25,6 +25,7 @@
 #include "ewah/ewok.h"
 #include "fsmonitor.h"
 #include "setup.h"
+#include "sparse-index.h"
 #include "submodule-config.h"
 #include "symlinks.h"
 #include "trace2.h"

diff --git a/entry.c b/entry.c
index 7791cc999cc970f4bc81c2140cf0b3c9af1a8b4f..53d00386748cc5ad44f0986972d59f8f87b0fa96 100644 (file)
--- a/entry.c
+++ b/entry.c
@@ -6,6 +6,7 @@
 #include "gettext.h"
 #include "hex.h"
 #include "name-hash.h"
+#include "sparse-index.h"
 #include "streaming.h"
 #include "submodule.h"
 #include "symlinks.h"

diff --git a/merge-ort.c b/merge-ort.c
index a50b095c470ef520f1b1b769ff40488edeb2e496..69e3c4a890ec5cffce8ea5eebd5bd1ad535733c2 100644 (file)
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -38,6 +38,7 @@
 #include "oid-array.h"
 #include "promisor-remote.h"
 #include "revision.h"
+#include "sparse-index.h"
 #include "strmap.h"
 #include "submodule-config.h"
 #include "submodule.h"

diff --git a/merge-recursive.c b/merge-recursive.c
index b341ba4f38db62331254bb5970a5738ff006de51..0e16e7a06df0b84fce8795f3912c76938bc18289 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -29,6 +29,7 @@
 #include "object-store.h"
 #include "repository.h"
 #include "revision.h"
+#include "sparse-index.h"
 #include "string-list.h"
 #include "submodule-config.h"
 #include "submodule.h"

diff --git a/resolve-undo.c b/resolve-undo.c
index 70a6db526d240da717aa7b926e10bbcddbe845a3..7ec09e89d4f8662f29a12350df6be517750ad8f5 100644 (file)
--- a/resolve-undo.c
+++ b/resolve-undo.c
@@ -2,6 +2,7 @@
 #include "dir.h"
 #include "hash.h"
 #include "resolve-undo.h"
+#include "sparse-index.h"
 #include "string-list.h"
 
 /* The only error case is to run out of memory in string-list */

diff --git a/revision.c b/revision.c
index b33cc1d106a207de3c5a42c413913877c129a28d..88b2f42daa6fb165ac31d9ef0fdecdb92ea36633 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -32,6 +32,7 @@
 #include "packfile.h"
 #include "worktree.h"
 #include "setup.h"
+#include "sparse-index.h"
 #include "strvec.h"
 #include "trace2.h"
 #include "commit-reach.h"

diff --git a/sequencer.c b/sequencer.c
index bceb6abcb6c733808b3defb7c30b9857be5d6e8e..d132cd884f90f0f9a853202a51b0b68cdeabcbd4 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -28,6 +28,7 @@
 #include "merge-ort.h"
 #include "merge-ort-wrappers.h"
 #include "refs.h"
+#include "sparse-index.h"
 #include "strvec.h"
 #include "quote.h"
 #include "trailer.h"

diff --git a/sparse-index.h b/sparse-index.h
index 59a92d819ecdac1430b69db081b79cfc7e8ca84a..a16f3e67d75913daffc7ded0e08118ca233d1f5d 100644 (file)
--- a/sparse-index.h
+++ b/sparse-index.h
@@ -37,4 +37,6 @@ struct pattern_list;
  */
 void expand_index(struct index_state *istate, struct pattern_list *pl);
 
+void ensure_full_index(struct index_state *istate);
+
 #endif