diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-11-10 06:49:02 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-12 14:50:06 +0900 |
| commit | c207e9e1f6dd1802f0deadae51af5615d855edc4 (patch) | |
| tree | 4142d6b30b54e65a692a3240341400b09437e40f /builtin | |
| parent | bundle.c: remove the_repository references (diff) | |
| download | git-c207e9e1f6dd1802f0deadae51af5615d855edc4.tar.gz git-c207e9e1f6dd1802f0deadae51af5615d855edc4.zip | |
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 'builtin')
| -rw-r--r-- | builtin/read-tree.c | 4 | ||||
| -rw-r--r-- | builtin/rebase.c | 2 | ||||
| -rw-r--r-- | builtin/reset.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/builtin/read-tree.c b/builtin/read-tree.c index fbbc98e516..c05c12d034 100644 --- a/builtin/read-tree.c +++ b/builtin/read-tree.c @@ -255,7 +255,9 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix) * what came from the tree. */ if (nr_trees == 1 && !opts.prefix) - prime_cache_tree(&the_index, trees[0]); + prime_cache_tree(the_repository, + the_repository->index, + trees[0]); if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK)) die("unable to write new index file"); diff --git a/builtin/rebase.c b/builtin/rebase.c index b9eb958454..d9bedecf86 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -582,7 +582,7 @@ static int reset_head(struct object_id *oid, const char *action, } tree = parse_tree_indirect(oid); - prime_cache_tree(the_repository->index, tree); + prime_cache_tree(the_repository, the_repository->index, tree); if (write_locked_index(the_repository->index, &lock, COMMIT_LOCK) < 0) ret = error(_("could not write index")); diff --git a/builtin/reset.c b/builtin/reset.c index 5b4bbb0fb5..161b5e0cae 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -93,7 +93,7 @@ static int reset_index(const struct object_id *oid, int reset_type, int quiet) if (reset_type == MIXED || reset_type == HARD) { tree = parse_tree_indirect(oid); - prime_cache_tree(&the_index, tree); + prime_cache_tree(the_repository, the_repository->index, tree); } ret = 0; |