diff options
author | brian m. carlson <sandals@crustytoothpaste.net> | 2015-11-10 05:22:28 +0300 |
---|---|---|
committer | Jeff King <peff@peff.net> | 2015-11-20 16:02:05 +0300 |
commit | f2fd0760f62e79609fef7bfd7ecebb002e8e4ced (patch) | |
tree | 1f915114b015428730e95a89697783560b672008 /builtin/pack-objects.c | |
parent | 7999b2cf772956466baa8925491d6fb1b0963292 (diff) |
Convert struct object to object_id
struct object is one of the major data structures dealing with object
IDs. Convert it to use struct object_id instead of an unsigned char
array. Convert get_object_hash to refer to the new member as well.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 'builtin/pack-objects.c')
-rw-r--r-- | builtin/pack-objects.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index b2d3e4ea27..fa1b5cd716 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -2338,7 +2338,7 @@ static int ofscmp(const void *a_, const void *b_) else if (a->offset > b->offset) return 1; else - return hashcmp(a->object->sha1, b->object->sha1); + return oidcmp(&a->object->oid, &b->object->oid); } static void add_objects_in_unpacked_packs(struct rev_info *revs) |