Remove get_object_hash.
Convert all instances of get_object_hash to use an appropriate reference to the hash member of the oid member of struct object. This provides no functional change, as it is essentially a macro substitution. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Jeff King <peff@peff.net>
This commit is contained in:
committed by
Jeff King
parent
f2fd0760f6
commit
ed1c9977cb
@ -568,7 +568,7 @@ static void find_merge_parents(struct merge_parents *result,
|
||||
if (!parent)
|
||||
continue;
|
||||
commit_list_insert(parent, &parents);
|
||||
add_merge_parent(result, get_object_hash(*obj), get_object_hash(parent->object));
|
||||
add_merge_parent(result, obj->oid.hash, parent->object.oid.hash);
|
||||
}
|
||||
head_commit = lookup_commit(head);
|
||||
if (head_commit)
|
||||
@ -578,7 +578,7 @@ static void find_merge_parents(struct merge_parents *result,
|
||||
while (parents) {
|
||||
struct commit *cmit = pop_commit(&parents);
|
||||
for (i = 0; i < result->nr; i++)
|
||||
if (!hashcmp(result->item[i].commit, get_object_hash(cmit->object)))
|
||||
if (!hashcmp(result->item[i].commit, cmit->object.oid.hash))
|
||||
result->item[i].used = 1;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user