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/index-pack.c | |
| parent | 3c4270107fec2c1d85b7b1a6f8b0aeebf3193b28 (diff) | |
| download | git-7999b2cf772956466baa8925491d6fb1b0963292.tar.gz | |
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/index-pack.c')
| -rw-r--r-- | builtin/index-pack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 1ad1bde696..b01a8c0e22 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -217,7 +217,7 @@ static unsigned check_object(struct object *obj) if (!(obj->flags & FLAG_CHECKED)) { unsigned long size; - int type = sha1_object_info(obj->sha1, &size); + int type = sha1_object_info(get_object_hash(*obj), &size); if (type <= 0) die(_("did not receive expected object %s"), sha1_to_hex(obj->sha1)); |