Git fork

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>

authored by

Elijah Newren and committed by
Junio C Hamano
baf889c2 f5653856

+21 -2
+1
builtin/checkout-index.c
··· 17 #include "entry.h" 18 #include "parallel-checkout.h" 19 #include "setup.h" 20 21 #define CHECKOUT_ALL 4 22 static int nul_term_line;
··· 17 #include "entry.h" 18 #include "parallel-checkout.h" 19 #include "setup.h" 20 + #include "sparse-index.h" 21 22 #define CHECKOUT_ALL 4 23 static int nul_term_line;
+1
builtin/commit.c
··· 38 #include "gpg-interface.h" 39 #include "column.h" 40 #include "sequencer.h" 41 #include "mailmap.h" 42 #include "help.h" 43 #include "commit-reach.h"
··· 38 #include "gpg-interface.h" 39 #include "column.h" 40 #include "sequencer.h" 41 + #include "sparse-index.h" 42 #include "mailmap.h" 43 #include "help.h" 44 #include "commit-reach.h"
+1
builtin/difftool.c
··· 23 #include "gettext.h" 24 #include "hex.h" 25 #include "parse-options.h" 26 #include "strvec.h" 27 #include "strbuf.h" 28 #include "lockfile.h"
··· 23 #include "gettext.h" 24 #include "hex.h" 25 #include "parse-options.h" 26 + #include "sparse-index.h" 27 #include "strvec.h" 28 #include "strbuf.h" 29 #include "lockfile.h"
+1
builtin/fsck.c
··· 25 #include "replace-object.h" 26 #include "resolve-undo.h" 27 #include "run-command.h" 28 #include "worktree.h" 29 #include "pack-revindex.h" 30 #include "pack-bitmap.h"
··· 25 #include "replace-object.h" 26 #include "resolve-undo.h" 27 #include "run-command.h" 28 + #include "sparse-index.h" 29 #include "worktree.h" 30 #include "pack-revindex.h" 31 #include "pack-bitmap.h"
+1
builtin/ls-files.c
··· 23 #include "pathspec.h" 24 #include "run-command.h" 25 #include "setup.h" 26 #include "submodule.h" 27 #include "submodule-config.h" 28 #include "object-store.h"
··· 23 #include "pathspec.h" 24 #include "run-command.h" 25 #include "setup.h" 26 + #include "sparse-index.h" 27 #include "submodule.h" 28 #include "submodule-config.h" 29 #include "object-store.h"
+1
builtin/merge-index.c
··· 3 #include "hex.h" 4 #include "repository.h" 5 #include "run-command.h" 6 7 static const char *pgm; 8 static int one_shot, quiet;
··· 3 #include "hex.h" 4 #include "repository.h" 5 #include "run-command.h" 6 + #include "sparse-index.h" 7 8 static const char *pgm; 9 static int one_shot, quiet;
+1
builtin/read-tree.c
··· 22 #include "repository.h" 23 #include "resolve-undo.h" 24 #include "setup.h" 25 #include "submodule.h" 26 #include "submodule-config.h" 27
··· 22 #include "repository.h" 23 #include "resolve-undo.h" 24 #include "setup.h" 25 + #include "sparse-index.h" 26 #include "submodule.h" 27 #include "submodule-config.h" 28
+1
builtin/reset.c
··· 29 #include "unpack-trees.h" 30 #include "cache-tree.h" 31 #include "setup.h" 32 #include "submodule.h" 33 #include "submodule-config.h" 34 #include "trace.h"
··· 29 #include "unpack-trees.h" 30 #include "cache-tree.h" 31 #include "setup.h" 32 + #include "sparse-index.h" 33 #include "submodule.h" 34 #include "submodule-config.h" 35 #include "trace.h"
+1
builtin/rm.c
··· 19 #include "repository.h" 20 #include "string-list.h" 21 #include "setup.h" 22 #include "submodule.h" 23 #include "pathspec.h" 24
··· 19 #include "repository.h" 20 #include "string-list.h" 21 #include "setup.h" 22 + #include "sparse-index.h" 23 #include "submodule.h" 24 #include "pathspec.h" 25
+1
builtin/stash.c
··· 20 #include "rerere.h" 21 #include "revision.h" 22 #include "setup.h" 23 #include "log-tree.h" 24 #include "diffcore.h" 25 #include "exec-cmd.h"
··· 20 #include "rerere.h" 21 #include "revision.h" 22 #include "setup.h" 23 + #include "sparse-index.h" 24 #include "log-tree.h" 25 #include "diffcore.h" 26 #include "exec-cmd.h"
+1
builtin/submodule--helper.c
··· 13 #include "pathspec.h" 14 #include "dir.h" 15 #include "setup.h" 16 #include "submodule.h" 17 #include "submodule-config.h" 18 #include "string-list.h"
··· 13 #include "pathspec.h" 14 #include "dir.h" 15 #include "setup.h" 16 + #include "sparse-index.h" 17 #include "submodule.h" 18 #include "submodule-config.h" 19 #include "string-list.h"
+1
builtin/update-index.c
··· 24 #include "dir.h" 25 #include "repository.h" 26 #include "setup.h" 27 #include "split-index.h" 28 #include "symlinks.h" 29 #include "fsmonitor.h"
··· 24 #include "dir.h" 25 #include "repository.h" 26 #include "setup.h" 27 + #include "sparse-index.h" 28 #include "split-index.h" 29 #include "symlinks.h" 30 #include "fsmonitor.h"
-2
cache.h
··· 327 const char *gitdir); 328 int is_index_unborn(struct index_state *); 329 330 - void ensure_full_index(struct index_state *istate); 331 - 332 /* For use with `write_locked_index()`. */ 333 #define COMMIT_LOCK (1 << 0) 334 #define SKIP_IF_UNCHANGED (1 << 1)
··· 327 const char *gitdir); 328 int is_index_unborn(struct index_state *); 329 330 /* For use with `write_locked_index()`. */ 331 #define COMMIT_LOCK (1 << 0) 332 #define SKIP_IF_UNCHANGED (1 << 1)
+1
dir.c
··· 25 #include "ewah/ewok.h" 26 #include "fsmonitor.h" 27 #include "setup.h" 28 #include "submodule-config.h" 29 #include "symlinks.h" 30 #include "trace2.h"
··· 25 #include "ewah/ewok.h" 26 #include "fsmonitor.h" 27 #include "setup.h" 28 + #include "sparse-index.h" 29 #include "submodule-config.h" 30 #include "symlinks.h" 31 #include "trace2.h"
+1
entry.c
··· 6 #include "gettext.h" 7 #include "hex.h" 8 #include "name-hash.h" 9 #include "streaming.h" 10 #include "submodule.h" 11 #include "symlinks.h"
··· 6 #include "gettext.h" 7 #include "hex.h" 8 #include "name-hash.h" 9 + #include "sparse-index.h" 10 #include "streaming.h" 11 #include "submodule.h" 12 #include "symlinks.h"
+1
merge-ort.c
··· 38 #include "oid-array.h" 39 #include "promisor-remote.h" 40 #include "revision.h" 41 #include "strmap.h" 42 #include "submodule-config.h" 43 #include "submodule.h"
··· 38 #include "oid-array.h" 39 #include "promisor-remote.h" 40 #include "revision.h" 41 + #include "sparse-index.h" 42 #include "strmap.h" 43 #include "submodule-config.h" 44 #include "submodule.h"
+1
merge-recursive.c
··· 29 #include "object-store.h" 30 #include "repository.h" 31 #include "revision.h" 32 #include "string-list.h" 33 #include "submodule-config.h" 34 #include "submodule.h"
··· 29 #include "object-store.h" 30 #include "repository.h" 31 #include "revision.h" 32 + #include "sparse-index.h" 33 #include "string-list.h" 34 #include "submodule-config.h" 35 #include "submodule.h"
+1
resolve-undo.c
··· 2 #include "dir.h" 3 #include "hash.h" 4 #include "resolve-undo.h" 5 #include "string-list.h" 6 7 /* The only error case is to run out of memory in string-list */
··· 2 #include "dir.h" 3 #include "hash.h" 4 #include "resolve-undo.h" 5 + #include "sparse-index.h" 6 #include "string-list.h" 7 8 /* The only error case is to run out of memory in string-list */
+1
revision.c
··· 32 #include "packfile.h" 33 #include "worktree.h" 34 #include "setup.h" 35 #include "strvec.h" 36 #include "trace2.h" 37 #include "commit-reach.h"
··· 32 #include "packfile.h" 33 #include "worktree.h" 34 #include "setup.h" 35 + #include "sparse-index.h" 36 #include "strvec.h" 37 #include "trace2.h" 38 #include "commit-reach.h"
+1
sequencer.c
··· 28 #include "merge-ort.h" 29 #include "merge-ort-wrappers.h" 30 #include "refs.h" 31 #include "strvec.h" 32 #include "quote.h" 33 #include "trailer.h"
··· 28 #include "merge-ort.h" 29 #include "merge-ort-wrappers.h" 30 #include "refs.h" 31 + #include "sparse-index.h" 32 #include "strvec.h" 33 #include "quote.h" 34 #include "trailer.h"
+2
sparse-index.h
··· 37 */ 38 void expand_index(struct index_state *istate, struct pattern_list *pl); 39 40 #endif
··· 37 */ 38 void expand_index(struct index_state *istate, struct pattern_list *pl); 39 40 + void ensure_full_index(struct index_state *istate); 41 + 42 #endif