Skip to content

Commit a21ef0a

Browse files
committed
Export the preload_index() function
The purpose of this function is to stat() the files listed in the index in a multi-threaded fashion. It is called directly after reading the index in the read_index_preloaded() function. However, in some cases we may want to separate the index reading from the preloading step, e.g. in builtin/add.c, where we need to load the index before we parse the pathspecs (which needs to error out if one of the pathspecs refers to a path within a submodule, for which the index must have been read already), and only then will we want to preload, possibly limited by the just-parsed pathspecs. So let's just export that function to allow calling it separately. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent 2ff32e8 commit a21ef0a

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

cache.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -659,6 +659,7 @@ extern int daemonize(void);
659659
/* Initialize and use the cache information */
660660
struct lock_file;
661661
extern int read_index(struct index_state *);
662+
extern void preload_index(struct index_state *, const struct pathspec *pathspec);
662663
extern int read_index_preload(struct index_state *, const struct pathspec *pathspec);
663664
extern int do_read_index(struct index_state *istate, const char *path,
664665
int must_exist); /* for testting only! */

preload-index.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
#include "fsmonitor.h"
88

99
#ifdef NO_PTHREADS
10-
static void preload_index(struct index_state *index,
11-
const struct pathspec *pathspec)
10+
void preload_index(struct index_state *index, const struct pathspec *pathspec)
1211
{
1312
; /* nothing */
1413
}
@@ -73,8 +72,7 @@ static void *preload_thread(void *_data)
7372
return NULL;
7473
}
7574

76-
static void preload_index(struct index_state *index,
77-
const struct pathspec *pathspec)
75+
void preload_index(struct index_state *index, const struct pathspec *pathspec)
7876
{
7977
int threads, i, work, offset;
8078
struct thread_data data[MAX_PARALLEL];

0 commit comments

Comments
 (0)