diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-02-21 23:47:35 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-22 10:12:15 -0800 |
| commit | 76c1d9a09624ae39fa9e3140f6581e672b9c040a (patch) | |
| tree | b146b591ad3123bcb93f66787e216c4bfd630e1e /builtin/pack-objects.c | |
| parent | 068f85e31311f521adffbcbf96f6583206d77b7d (diff) | |
| download | git-76c1d9a09624ae39fa9e3140f6581e672b9c040a.tar.gz | |
Convert object iteration callbacks to struct object_id
Convert each_loose_object_fn and each_packed_object_fn to take a pointer
to struct object_id. Update the various callbacks. Convert several
40-based constants to use GIT_SHA1_HEXSZ.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/pack-objects.c')
| -rw-r--r-- | builtin/pack-objects.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 8841f8b366..6e7c3a6575 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -2534,17 +2534,17 @@ static void add_objects_in_unpacked_packs(struct rev_info *revs) free(in_pack.array); } -static int add_loose_object(const unsigned char *sha1, const char *path, +static int add_loose_object(const struct object_id *oid, const char *path, void *data) { - enum object_type type = sha1_object_info(sha1, NULL); + enum object_type type = sha1_object_info(oid->hash, NULL); if (type < 0) { warning("loose object at %s could not be examined", path); return 0; } - add_object_entry(sha1, type, "", 0); + add_object_entry(oid->hash, type, "", 0); return 0; } |