mirror of
https://github.com/git/git
synced 2024-11-05 01:58:18 +00:00
preload-index.h: move declarations for preload-index.c from elsewhere
We already have a preload-index.c file; move the declarations for the functions in that file into a new preload-index.h. These were previously split between cache.h and repository.h. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
baf889c2cd
commit
fbffdfb11c
15 changed files with 27 additions and 6 deletions
|
@ -5,6 +5,7 @@
|
|||
#include "diffcore.h"
|
||||
#include "gettext.h"
|
||||
#include "hex.h"
|
||||
#include "preload-index.h"
|
||||
#include "revision.h"
|
||||
#include "refs.h"
|
||||
#include "string-list.h"
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
#include "cache-tree.h"
|
||||
#include "run-command.h"
|
||||
#include "parse-options.h"
|
||||
#include "preload-index.h"
|
||||
#include "diff.h"
|
||||
#include "diffcore.h"
|
||||
#include "revision.h"
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
#include "unpack-trees.h"
|
||||
#include "branch.h"
|
||||
#include "object-name.h"
|
||||
#include "preload-index.h"
|
||||
#include "sequencer.h"
|
||||
#include "revision.h"
|
||||
#include "merge-recursive.h"
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
#include "object-name.h"
|
||||
#include "object-store.h"
|
||||
#include "parse-options.h"
|
||||
#include "preload-index.h"
|
||||
#include "refs.h"
|
||||
#include "remote.h"
|
||||
#include "resolve-undo.h"
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
#include "utf8.h"
|
||||
#include "object-name.h"
|
||||
#include "parse-options.h"
|
||||
#include "preload-index.h"
|
||||
#include "string-list.h"
|
||||
#include "rerere.h"
|
||||
#include "unpack-trees.h"
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
#include "diff.h"
|
||||
#include "diff-merges.h"
|
||||
#include "commit.h"
|
||||
#include "preload-index.h"
|
||||
#include "revision.h"
|
||||
#include "builtin.h"
|
||||
#include "submodule.h"
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
#include "diff.h"
|
||||
#include "diff-merges.h"
|
||||
#include "commit.h"
|
||||
#include "preload-index.h"
|
||||
#include "revision.h"
|
||||
#include "builtin.h"
|
||||
#include "setup.h"
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
#include "diff.h"
|
||||
#include "diff-merges.h"
|
||||
#include "diffcore.h"
|
||||
#include "preload-index.h"
|
||||
#include "revision.h"
|
||||
#include "log-tree.h"
|
||||
#include "builtin.h"
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
#include "run-command.h"
|
||||
#include "dir.h"
|
||||
#include "entry.h"
|
||||
#include "preload-index.h"
|
||||
#include "rerere.h"
|
||||
#include "revision.h"
|
||||
#include "setup.h"
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
#include "parse-options.h"
|
||||
#include "quote.h"
|
||||
#include "pathspec.h"
|
||||
#include "preload-index.h"
|
||||
#include "dir.h"
|
||||
#include "setup.h"
|
||||
#include "sparse-index.h"
|
||||
|
|
3
cache.h
3
cache.h
|
@ -318,9 +318,6 @@ extern struct index_state the_index;
|
|||
|
||||
/* Initialize and use the cache information */
|
||||
struct lock_file;
|
||||
void preload_index(struct index_state *index,
|
||||
const struct pathspec *pathspec,
|
||||
unsigned int refresh_flags);
|
||||
int do_read_index(struct index_state *istate, const char *path,
|
||||
int must_exist); /* for testting only! */
|
||||
int read_index_from(struct index_state *, const char *path,
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
#include "fsmonitor.h"
|
||||
#include "gettext.h"
|
||||
#include "config.h"
|
||||
#include "preload-index.h"
|
||||
#include "progress.h"
|
||||
#include "thread-utils.h"
|
||||
#include "repository.h"
|
||||
|
|
15
preload-index.h
Normal file
15
preload-index.h
Normal file
|
@ -0,0 +1,15 @@
|
|||
#ifndef PRELOAD_INDEX_H
|
||||
#define PRELOAD_INDEX_H
|
||||
|
||||
struct index_state;
|
||||
struct pathspec;
|
||||
struct repository;
|
||||
|
||||
void preload_index(struct index_state *index,
|
||||
const struct pathspec *pathspec,
|
||||
unsigned int refresh_flags);
|
||||
int repo_read_index_preload(struct repository *,
|
||||
const struct pathspec *pathspec,
|
||||
unsigned refresh_flags);
|
||||
|
||||
#endif /* PRELOAD_INDEX_H */
|
|
@ -27,6 +27,7 @@
|
|||
#include "mem-pool.h"
|
||||
#include "name-hash.h"
|
||||
#include "object-name.h"
|
||||
#include "preload-index.h"
|
||||
#include "resolve-undo.h"
|
||||
#include "revision.h"
|
||||
#include "run-command.h"
|
||||
|
|
|
@ -221,9 +221,6 @@ int repo_hold_locked_index(struct repository *repo,
|
|||
struct lock_file *lf,
|
||||
int flags);
|
||||
|
||||
int repo_read_index_preload(struct repository *,
|
||||
const struct pathspec *pathspec,
|
||||
unsigned refresh_flags);
|
||||
int repo_read_index_unmerged(struct repository *);
|
||||
/*
|
||||
* Opportunistically update the index but do not complain if we can't.
|
||||
|
|
Loading…
Reference in a new issue