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>
This commit is contained in:

committed by
Junio C Hamano

parent
d3b4705ab8
commit
5e57580733
@ -3194,7 +3194,7 @@ static int do_reset(struct repository *r,
|
||||
return error_resolve_conflict(_(action_name(opts)));
|
||||
}
|
||||
|
||||
if (!fill_tree_descriptor(&desc, &oid)) {
|
||||
if (!fill_tree_descriptor(r, &desc, &oid)) {
|
||||
error(_("failed to find tree of %s"), oid_to_hex(&oid));
|
||||
rollback_lock_file(&lock);
|
||||
free((void *)desc.buffer);
|
||||
|
Reference in New Issue
Block a user