diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-06-27 16:28:48 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-06-27 12:45:17 -0700 |
| commit | 5e575807337d15dbecf88767e709df08304e3b94 (patch) | |
| tree | e74223df14c8a18469a7c9d86825c23fb1142152 /builtin/reset.c | |
| parent | sha1-file.c: remove the_repo from read_object_with_reference() (diff) | |
| download | tgif-5e575807337d15dbecf88767e709df08304e3b94.tar.xz | |
tree-walk.c: remove the_repo from fill_tree_descriptor()
While at there, clean up the_repo usage in builtin/merge-tree.c a tiny
bit.
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/reset.c')
| -rw-r--r-- | builtin/reset.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/reset.c b/builtin/reset.c index 26ef9a7bd0..77c38f28c2 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; } |