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
@ -2045,11 +2045,11 @@ static int clean_index(const struct object_id *head, const struct object_id *rem
|
||||
struct tree *head_tree, *remote_tree, *index_tree;
|
||||
struct object_id index;
|
||||
|
||||
head_tree = parse_tree_indirect(head->hash);
|
||||
head_tree = parse_tree_indirect(head);
|
||||
if (!head_tree)
|
||||
return error(_("Could not parse object '%s'."), oid_to_hex(head));
|
||||
|
||||
remote_tree = parse_tree_indirect(remote->hash);
|
||||
remote_tree = parse_tree_indirect(remote);
|
||||
if (!remote_tree)
|
||||
return error(_("Could not parse object '%s'."), oid_to_hex(remote));
|
||||
|
||||
@ -2061,7 +2061,7 @@ static int clean_index(const struct object_id *head, const struct object_id *rem
|
||||
if (write_cache_as_tree(index.hash, 0, NULL))
|
||||
return -1;
|
||||
|
||||
index_tree = parse_tree_indirect(index.hash);
|
||||
index_tree = parse_tree_indirect(&index);
|
||||
if (!index_tree)
|
||||
return error(_("Could not parse object '%s'."), oid_to_hex(&index));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user