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
6
tag.c
6
tag.c
@ -10,7 +10,7 @@ struct object *deref_tag(struct object *o, const char *warn, int warnlen)
|
||||
{
|
||||
while (o && o->type == OBJ_TAG)
|
||||
if (((struct tag *)o)->tagged)
|
||||
o = parse_object(get_object_hash(*((struct tag *)o)->tagged));
|
||||
o = parse_object(((struct tag *)o)->tagged->oid.hash);
|
||||
else
|
||||
o = NULL;
|
||||
if (!o && warn) {
|
||||
@ -24,7 +24,7 @@ struct object *deref_tag(struct object *o, const char *warn, int warnlen)
|
||||
struct object *deref_tag_noverify(struct object *o)
|
||||
{
|
||||
while (o && o->type == OBJ_TAG) {
|
||||
o = parse_object(get_object_hash(*o));
|
||||
o = parse_object(o->oid.hash);
|
||||
if (o && o->type == OBJ_TAG && ((struct tag *)o)->tagged)
|
||||
o = ((struct tag *)o)->tagged;
|
||||
else
|
||||
@ -127,7 +127,7 @@ int parse_tag(struct tag *item)
|
||||
|
||||
if (item->object.parsed)
|
||||
return 0;
|
||||
data = read_sha1_file(get_object_hash(item->object), &type, &size);
|
||||
data = read_sha1_file(item->object.oid.hash, &type, &size);
|
||||
if (!data)
|
||||
return error("Could not read %s",
|
||||
oid_to_hex(&item->object.oid));
|
||||
|
||||
Reference in New Issue
Block a user