summaryrefslogtreecommitdiff
path: root/builtin/reset.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-07-19 18:30:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-07-19 18:30:21 (GMT)
commit1eb0a12ec3934b7fc398b118806fdf7550ae636e (patch)
tree7ffd8929d36f31040b31a92f45548154986e8fdf /builtin/reset.c
parentd97c62c828d6f0eb7ba7067c8c24793620900dd8 (diff)
parent663d25018f11418ed888128e8b07b1cbe576712a (diff)
downloadgit-1eb0a12ec3934b7fc398b118806fdf7550ae636e.zip
git-1eb0a12ec3934b7fc398b118806fdf7550ae636e.tar.gz
git-1eb0a12ec3934b7fc398b118806fdf7550ae636e.tar.bz2
Merge branch 'nd/tree-walk-with-repo'
The tree-walk API learned to pass an in-core repository instance throughout more codepaths. * nd/tree-walk-with-repo: t7814: do not generate same commits in different repos Use the right 'struct repository' instead of the_repository match-trees.c: remove the_repo from shift_tree*() tree-walk.c: remove the_repo from get_tree_entry_follow_symlinks() tree-walk.c: remove the_repo from get_tree_entry() tree-walk.c: remove the_repo from fill_tree_descriptor() sha1-file.c: remove the_repo from read_object_with_reference()
Diffstat (limited to 'builtin/reset.c')
-rw-r--r--builtin/reset.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/reset.c b/builtin/reset.c
index c2bb35a..fdd5721 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -79,13 +79,13 @@ static int reset_index(const struct object_id *oid, int reset_type, int quiet)
struct object_id head_oid;
if (get_oid("HEAD", &head_oid))
return error(_("You do not have a valid HEAD."));
- if (!fill_tree_descriptor(desc + nr, &head_oid))
+ if (!fill_tree_descriptor(the_repository, desc + nr, &head_oid))
return error(_("Failed to find tree of HEAD."));
nr++;
opts.fn = twoway_merge;
}
- if (!fill_tree_descriptor(desc + nr, oid)) {
+ if (!fill_tree_descriptor(the_repository, desc + nr, oid)) {
error(_("Failed to find tree of %s."), oid_to_hex(oid));
goto out;
}