diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-01-12 09:13:26 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-01-14 12:13:04 -0800 |
| commit | e1ff0a32e48eb0f3e53970df3f941d183093ff5a (patch) | |
| tree | b9d9a617170b562f93a9d262443a8bc45834ed74 /revision.c | |
| parent | checkout: avoid the_index when possible (diff) | |
| download | tgif-e1ff0a32e48eb0f3e53970df3f941d183093ff5a.tar.xz | |
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 'revision.c')
| -rw-r--r-- | revision.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/revision.c b/revision.c index 13e0519c02..c51ea6a052 100644 --- a/revision.c +++ b/revision.c @@ -1384,7 +1384,7 @@ void add_index_objects_to_pending(struct rev_info *revs, unsigned int flags) { struct worktree **worktrees, **p; - read_index(revs->repo->index); + repo_read_index(revs->repo); do_add_index_objects_to_pending(revs, revs->repo->index, flags); if (revs->single_worktree) @@ -1530,7 +1530,7 @@ static void prepare_show_merge(struct rev_info *revs) head->object.flags |= SYMMETRIC_LEFT; if (!istate->cache_nr) - read_index(istate); + repo_read_index(revs->repo); for (i = 0; i < istate->cache_nr; i++) { const struct cache_entry *ce = istate->cache[i]; if (!ce_stage(ce)) |