diff options
author | brian m. carlson <sandals@crustytoothpaste.net> | 2015-11-10 02:22:27 +0000 |
---|---|---|
committer | Jeff King <peff@peff.net> | 2015-11-20 08:02:05 -0500 |
commit | 7999b2cf772956466baa8925491d6fb1b0963292 (patch) | |
tree | 34a3bf75c3cdc621d732107f53181ff28c0550a4 /tag.c | |
parent | 3c4270107fec2c1d85b7b1a6f8b0aeebf3193b28 (diff) | |
download | git-7999b2cf772956466baa8925491d6fb1b0963292.tar.gz git-7999b2cf772956466baa8925491d6fb1b0963292.tar.xz |
Add several uses of get_object_hash.
Convert most instances where the sha1 member of struct object is
dereferenced to use get_object_hash. Most instances that are passed to
functions that have versions taking struct object_id, such as
get_sha1_hex/get_oid_hex, or instances that can be trivially converted
to use struct object_id instead, are not converted.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 'tag.c')
-rw-r--r-- | tag.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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(((struct tag *)o)->tagged->sha1); + o = parse_object(get_object_hash(*((struct tag *)o)->tagged)); 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(o->sha1); + o = parse_object(get_object_hash(*o)); 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(item->object.sha1, &type, &size); + data = read_sha1_file(get_object_hash(item->object), &type, &size); if (!data) return error("Could not read %s", sha1_to_hex(item->object.sha1)); |