diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-11-10 05:49:02 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-12 05:50:06 (GMT) |
| commit | c207e9e1f6dd1802f0deadae51af5615d855edc4 (patch) | |
| tree | 4142d6b30b54e65a692a3240341400b09437e40f /sequencer.c | |
| parent | 74ae4b638d0acf6ab155422152d7ad98fdbe6f6b (diff) | |
| download | git-c207e9e1f6dd1802f0deadae51af5615d855edc4.zip git-c207e9e1f6dd1802f0deadae51af5615d855edc4.tar.gz git-c207e9e1f6dd1802f0deadae51af5615d855edc4.tar.bz2 | |
cache-tree.c: remove the_repository references
This case is more interesting than other boring "remove the_repo"
commits because while we need access to the object database, we cannot
simply use r->index because unpack-trees.c can operate on a temporary
index, not $GIT_DIR/index. Ideally we should be able to pass an object
database to lookup_tree() but that ship has sailed.
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 'sequencer.c')
| -rw-r--r-- | sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index 111cb74..726f727 100644 --- a/sequencer.c +++ b/sequencer.c @@ -2991,7 +2991,7 @@ static int do_reset(struct repository *r, } tree = parse_tree_indirect(&oid); - prime_cache_tree(r->index, tree); + prime_cache_tree(r, r->index, tree); if (write_locked_index(r->index, &lock, COMMIT_LOCK) < 0) ret = error(_("could not write index")); |