diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-01-12 02:13:26 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-14 20:13:04 (GMT) |
| commit | e1ff0a32e48eb0f3e53970df3f941d183093ff5a (patch) | |
| tree | b9d9a617170b562f93a9d262443a8bc45834ed74 /merge-recursive.c | |
| parent | fb4a8464a6d7ba643a8ebdb3ad8e1e84f0a01b0a (diff) | |
| download | git-e1ff0a32e48eb0f3e53970df3f941d183093ff5a.zip git-e1ff0a32e48eb0f3e53970df3f941d183093ff5a.tar.gz git-e1ff0a32e48eb0f3e53970df3f941d183093ff5a.tar.bz2 | |
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 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 8dba939..5fbd425 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -3576,7 +3576,7 @@ int merge_recursive(struct merge_options *o, discard_cache(); if (!o->call_depth) - read_cache(); + repo_read_index(the_repository); o->ancestor = "merged common ancestors"; clean = merge_trees(o, get_commit_tree(h1), get_commit_tree(h2), |