diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-01-12 03:13:26 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-14 21:13:04 +0100 |
| commit | e1ff0a32e48eb0f3e53970df3f941d183093ff5a (patch) | |
| tree | b9d9a617170b562f93a9d262443a8bc45834ed74 /preload-index.c | |
| parent | checkout: avoid the_index when possible (diff) | |
| download | git-e1ff0a32e48eb0f3e53970df3f941d183093ff5a.tar.xz git-e1ff0a32e48eb0f3e53970df3f941d183093ff5a.zip | |
read-cache.c: kill read_index()
read_index() shares the same problem as hold_locked_index(): it
assumes $GIT_DIR/index. Move all call sites to repo_read_index()
instead. read_index_preload() and read_index_unmerged() are also
killed as a consequence.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'preload-index.c')
| -rw-r--r-- | preload-index.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/preload-index.c b/preload-index.c index c7dc3f2b9f..e73600ee78 100644 --- a/preload-index.c +++ b/preload-index.c @@ -8,6 +8,7 @@ #include "config.h" #include "progress.h" #include "thread-utils.h" +#include "repository.h" /* * Mostly randomly chosen maximum thread counts: we @@ -146,12 +147,12 @@ void preload_index(struct index_state *index, trace_performance_leave("preload index"); } -int read_index_preload(struct index_state *index, - const struct pathspec *pathspec, - unsigned int refresh_flags) +int repo_read_index_preload(struct repository *repo, + const struct pathspec *pathspec, + unsigned int refresh_flags) { - int retval = read_index(index); + int retval = repo_read_index(repo); - preload_index(index, pathspec, refresh_flags); + preload_index(repo->index, pathspec, refresh_flags); return retval; } |