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

Note in particular that this reverses the decision made in 118a2e8bde
("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>
This commit is contained in:
Elijah Newren 2023-05-16 06:33:51 +00:00 committed by Junio C Hamano
parent f5653856c2
commit baf889c2cd
21 changed files with 21 additions and 2 deletions

View file

@ -17,6 +17,7 @@
#include "entry.h" #include "entry.h"
#include "parallel-checkout.h" #include "parallel-checkout.h"
#include "setup.h" #include "setup.h"
#include "sparse-index.h"
#define CHECKOUT_ALL 4 #define CHECKOUT_ALL 4
static int nul_term_line; static int nul_term_line;

View file

@ -38,6 +38,7 @@
#include "gpg-interface.h" #include "gpg-interface.h"
#include "column.h" #include "column.h"
#include "sequencer.h" #include "sequencer.h"
#include "sparse-index.h"
#include "mailmap.h" #include "mailmap.h"
#include "help.h" #include "help.h"
#include "commit-reach.h" #include "commit-reach.h"

View file

@ -23,6 +23,7 @@
#include "gettext.h" #include "gettext.h"
#include "hex.h" #include "hex.h"
#include "parse-options.h" #include "parse-options.h"
#include "sparse-index.h"
#include "strvec.h" #include "strvec.h"
#include "strbuf.h" #include "strbuf.h"
#include "lockfile.h" #include "lockfile.h"

View file

@ -25,6 +25,7 @@
#include "replace-object.h" #include "replace-object.h"
#include "resolve-undo.h" #include "resolve-undo.h"
#include "run-command.h" #include "run-command.h"
#include "sparse-index.h"
#include "worktree.h" #include "worktree.h"
#include "pack-revindex.h" #include "pack-revindex.h"
#include "pack-bitmap.h" #include "pack-bitmap.h"

View file

@ -23,6 +23,7 @@
#include "pathspec.h" #include "pathspec.h"
#include "run-command.h" #include "run-command.h"
#include "setup.h" #include "setup.h"
#include "sparse-index.h"
#include "submodule.h" #include "submodule.h"
#include "submodule-config.h" #include "submodule-config.h"
#include "object-store.h" #include "object-store.h"

View file

@ -3,6 +3,7 @@
#include "hex.h" #include "hex.h"
#include "repository.h" #include "repository.h"
#include "run-command.h" #include "run-command.h"
#include "sparse-index.h"
static const char *pgm; static const char *pgm;
static int one_shot, quiet; static int one_shot, quiet;

View file

@ -22,6 +22,7 @@
#include "repository.h" #include "repository.h"
#include "resolve-undo.h" #include "resolve-undo.h"
#include "setup.h" #include "setup.h"
#include "sparse-index.h"
#include "submodule.h" #include "submodule.h"
#include "submodule-config.h" #include "submodule-config.h"

View file

@ -29,6 +29,7 @@
#include "unpack-trees.h" #include "unpack-trees.h"
#include "cache-tree.h" #include "cache-tree.h"
#include "setup.h" #include "setup.h"
#include "sparse-index.h"
#include "submodule.h" #include "submodule.h"
#include "submodule-config.h" #include "submodule-config.h"
#include "trace.h" #include "trace.h"

View file

@ -19,6 +19,7 @@
#include "repository.h" #include "repository.h"
#include "string-list.h" #include "string-list.h"
#include "setup.h" #include "setup.h"
#include "sparse-index.h"
#include "submodule.h" #include "submodule.h"
#include "pathspec.h" #include "pathspec.h"

View file

@ -20,6 +20,7 @@
#include "rerere.h" #include "rerere.h"
#include "revision.h" #include "revision.h"
#include "setup.h" #include "setup.h"
#include "sparse-index.h"
#include "log-tree.h" #include "log-tree.h"
#include "diffcore.h" #include "diffcore.h"
#include "exec-cmd.h" #include "exec-cmd.h"

View file

@ -13,6 +13,7 @@
#include "pathspec.h" #include "pathspec.h"
#include "dir.h" #include "dir.h"
#include "setup.h" #include "setup.h"
#include "sparse-index.h"
#include "submodule.h" #include "submodule.h"
#include "submodule-config.h" #include "submodule-config.h"
#include "string-list.h" #include "string-list.h"

View file

@ -24,6 +24,7 @@
#include "dir.h" #include "dir.h"
#include "repository.h" #include "repository.h"
#include "setup.h" #include "setup.h"
#include "sparse-index.h"
#include "split-index.h" #include "split-index.h"
#include "symlinks.h" #include "symlinks.h"
#include "fsmonitor.h" #include "fsmonitor.h"

View file

@ -327,8 +327,6 @@ int read_index_from(struct index_state *, const char *path,
const char *gitdir); const char *gitdir);
int is_index_unborn(struct index_state *); int is_index_unborn(struct index_state *);
void ensure_full_index(struct index_state *istate);
/* For use with `write_locked_index()`. */ /* For use with `write_locked_index()`. */
#define COMMIT_LOCK (1 << 0) #define COMMIT_LOCK (1 << 0)
#define SKIP_IF_UNCHANGED (1 << 1) #define SKIP_IF_UNCHANGED (1 << 1)

1
dir.c
View file

@ -25,6 +25,7 @@
#include "ewah/ewok.h" #include "ewah/ewok.h"
#include "fsmonitor.h" #include "fsmonitor.h"
#include "setup.h" #include "setup.h"
#include "sparse-index.h"
#include "submodule-config.h" #include "submodule-config.h"
#include "symlinks.h" #include "symlinks.h"
#include "trace2.h" #include "trace2.h"

View file

@ -6,6 +6,7 @@
#include "gettext.h" #include "gettext.h"
#include "hex.h" #include "hex.h"
#include "name-hash.h" #include "name-hash.h"
#include "sparse-index.h"
#include "streaming.h" #include "streaming.h"
#include "submodule.h" #include "submodule.h"
#include "symlinks.h" #include "symlinks.h"

View file

@ -38,6 +38,7 @@
#include "oid-array.h" #include "oid-array.h"
#include "promisor-remote.h" #include "promisor-remote.h"
#include "revision.h" #include "revision.h"
#include "sparse-index.h"
#include "strmap.h" #include "strmap.h"
#include "submodule-config.h" #include "submodule-config.h"
#include "submodule.h" #include "submodule.h"

View file

@ -29,6 +29,7 @@
#include "object-store.h" #include "object-store.h"
#include "repository.h" #include "repository.h"
#include "revision.h" #include "revision.h"
#include "sparse-index.h"
#include "string-list.h" #include "string-list.h"
#include "submodule-config.h" #include "submodule-config.h"
#include "submodule.h" #include "submodule.h"

View file

@ -2,6 +2,7 @@
#include "dir.h" #include "dir.h"
#include "hash.h" #include "hash.h"
#include "resolve-undo.h" #include "resolve-undo.h"
#include "sparse-index.h"
#include "string-list.h" #include "string-list.h"
/* The only error case is to run out of memory in string-list */ /* The only error case is to run out of memory in string-list */

View file

@ -32,6 +32,7 @@
#include "packfile.h" #include "packfile.h"
#include "worktree.h" #include "worktree.h"
#include "setup.h" #include "setup.h"
#include "sparse-index.h"
#include "strvec.h" #include "strvec.h"
#include "trace2.h" #include "trace2.h"
#include "commit-reach.h" #include "commit-reach.h"

View file

@ -28,6 +28,7 @@
#include "merge-ort.h" #include "merge-ort.h"
#include "merge-ort-wrappers.h" #include "merge-ort-wrappers.h"
#include "refs.h" #include "refs.h"
#include "sparse-index.h"
#include "strvec.h" #include "strvec.h"
#include "quote.h" #include "quote.h"
#include "trailer.h" #include "trailer.h"

View file

@ -37,4 +37,6 @@ struct pattern_list;
*/ */
void expand_index(struct index_state *istate, struct pattern_list *pl); void expand_index(struct index_state *istate, struct pattern_list *pl);
void ensure_full_index(struct index_state *istate);
#endif #endif