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
@ -1540,9 +1540,9 @@ void diff_tree_combined_merge(const struct commit *commit, int dense,
|
||||
struct sha1_array parents = SHA1_ARRAY_INIT;
|
||||
|
||||
while (parent) {
|
||||
sha1_array_append(&parents, get_object_hash(parent->item->object));
|
||||
sha1_array_append(&parents, parent->item->object.oid.hash);
|
||||
parent = parent->next;
|
||||
}
|
||||
diff_tree_combined(get_object_hash(commit->object), &parents, dense, rev);
|
||||
diff_tree_combined(commit->object.oid.hash, &parents, dense, rev);
|
||||
sha1_array_clear(&parents);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user