Merge pull request git-for-windows#971 from jeffhostetler/jeffhostetl…

…er/add_preload_fscache add: use preload-index and fscache for performance
dscho · Nov 29, 2016 · 2cfb5e5 · 2cfb5e5
2 parents 7d0be42 + 0b70192
commit 2cfb5e5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/builtin/add.c b/builtin/add.c
@@ -389,6 +389,10 @@ int cmd_add(int argc, const char **argv, const char *prefix)
  PATHSPEC_STRIP_SUBMODULE_SLASH_EXPENSIVE,
  prefix, argv);
 
+ enable_fscache(1);
+ /* We do not really re-read the index, but update the up-to-date flags */
+ preload_index(&the_index, &pathspec);
+
  if (add_new_files) {
  int baselen;
 

diff --git a/cache.h b/cache.h
@@ -576,6 +576,7 @@ extern int daemonize(void);
 /* Initialize and use the cache information */
 struct lock_file;
 extern int read_index(struct index_state *);
+extern void preload_index(struct index_state *, const struct pathspec *pathspec);
 extern int read_index_preload(struct index_state *, const struct pathspec *pathspec);
 extern int do_read_index(struct index_state *istate, const char *path,
  int must_exist); /* for testting only! */

diff --git a/preload-index.c b/preload-index.c
@@ -6,8 +6,7 @@
 #include "dir.h"
 
 #ifdef NO_PTHREADS
-static void preload_index(struct index_state *index,
- const struct pathspec *pathspec)
+void preload_index(struct index_state *index, const struct pathspec *pathspec)
 {
  ; /* nothing */
 }
@@ -71,8 +70,7 @@ static void *preload_thread(void *_data)
  return NULL;
 }
 
-static void preload_index(struct index_state *index,
- const struct pathspec *pathspec)
+void preload_index(struct index_state *index, const struct pathspec *pathspec)
 {
  int threads, i, work, offset;
  struct thread_data data[MAX_PARALLEL];