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 /builtin/rev-list.c | |
parent | object: introduce get_object_hash macro. (diff) | |
download | tgif-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 'builtin/rev-list.c')
-rw-r--r-- | builtin/rev-list.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/rev-list.c b/builtin/rev-list.c index 491d298fa2..1cd5db1ae5 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -81,7 +81,7 @@ static void show_commit(struct commit *commit, void *data) if (!revs->graph) fputs(get_revision_mark(revs, commit), stdout); if (revs->abbrev_commit && revs->abbrev) - fputs(find_unique_abbrev(commit->object.sha1, revs->abbrev), + fputs(find_unique_abbrev(get_object_hash(commit->object), revs->abbrev), stdout); else fputs(sha1_to_hex(commit->object.sha1), stdout); @@ -185,7 +185,7 @@ static void finish_object(struct object *obj, if (obj->type == OBJ_BLOB && !has_sha1_file(obj->sha1)) die("missing blob object '%s'", sha1_to_hex(obj->sha1)); if (info->revs->verify_objects && !obj->parsed && obj->type != OBJ_COMMIT) - parse_object(obj->sha1); + parse_object(get_object_hash(*obj)); } static void show_object(struct object *obj, |