tree: convert parse_tree_indirect to struct object_id
Convert parse_tree_indirect to take a pointer to struct object_id. Update all the callers. This transformation was achieved using the following semantic patch and manual updates to the declaration and definition. Update builtin/checkout.c manually as well, since it uses a ternary expression not handled by the semantic patch. @@ expression E1; @@ - parse_tree_indirect(E1.hash) + parse_tree_indirect(&E1) @@ expression E1; @@ - parse_tree_indirect(E1->hash) + parse_tree_indirect(E1) Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
48be4c625b
commit
a9dbc17910
@ -84,7 +84,7 @@ static int reset_index(const struct object_id *oid, int reset_type, int quiet)
|
||||
return -1;
|
||||
|
||||
if (reset_type == MIXED || reset_type == HARD) {
|
||||
tree = parse_tree_indirect(oid->hash);
|
||||
tree = parse_tree_indirect(oid);
|
||||
prime_cache_tree(&the_index, tree);
|
||||
}
|
||||
|
||||
@ -311,7 +311,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
|
||||
struct tree *tree;
|
||||
if (get_sha1_treeish(rev, oid.hash))
|
||||
die(_("Failed to resolve '%s' as a valid tree."), rev);
|
||||
tree = parse_tree_indirect(oid.hash);
|
||||
tree = parse_tree_indirect(&oid);
|
||||
if (!tree)
|
||||
die(_("Could not parse object '%s'."), rev);
|
||||
oidcpy(&oid, &tree->object.oid);
|
||||
|
Reference in New Issue
Block a user