diff options
author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-03-12 02:27:46 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-03-14 16:23:49 (GMT) |
commit | abef9020e3df87c441c9a3a95f592fce5fa49bb9 (patch) | |
tree | b04714a271049de3d7402e20e868beb5cee30995 /builtin/pack-objects.c | |
parent | 7984f23833d1c1b8d7d5d863ed8c42b67e0a0fba (diff) | |
download | git-abef9020e3df87c441c9a3a95f592fce5fa49bb9.zip git-abef9020e3df87c441c9a3a95f592fce5fa49bb9.tar.gz git-abef9020e3df87c441c9a3a95f592fce5fa49bb9.tar.bz2 |
sha1_file: convert sha1_object_info* to object_id
Convert sha1_object_info and sha1_object_info_extended to take pointers
to struct object_id and rename them to use "oid" instead of "sha1" in
their names. Update the declaration and definition and apply the
following semantic patch, plus the standard object_id transforms:
@@
expression E1, E2;
@@
- sha1_object_info(E1.hash, E2)
+ oid_object_info(&E1, E2)
@@
expression E1, E2;
@@
- sha1_object_info(E1->hash, E2)
+ oid_object_info(E1, E2)
@@
expression E1, E2, E3;
@@
- sha1_object_info_extended(E1.hash, E2, E3)
+ oid_object_info_extended(&E1, E2, E3)
@@
expression E1, E2, E3;
@@
- sha1_object_info_extended(E1->hash, E2, E3)
+ oid_object_info_extended(E1, E2, E3)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/pack-objects.c')
-rw-r--r-- | builtin/pack-objects.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 8307cc9..66bc005 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -1516,7 +1516,7 @@ static void check_object(struct object_entry *entry) unuse_pack(&w_curs); } - entry->type = sha1_object_info(entry->idx.oid.hash, &entry->size); + entry->type = oid_object_info(&entry->idx.oid, &entry->size); /* * The error condition is checked in prepare_pack(). This is * to permit a missing preferred base object to be ignored @@ -1578,8 +1578,7 @@ static void drop_reused_delta(struct object_entry *entry) * And if that fails, the error will be recorded in entry->type * and dealt with in prepare_pack(). */ - entry->type = sha1_object_info(entry->idx.oid.hash, - &entry->size); + entry->type = oid_object_info(&entry->idx.oid, &entry->size); } } @@ -2708,7 +2707,7 @@ static void add_objects_in_unpacked_packs(struct rev_info *revs) static int add_loose_object(const struct object_id *oid, const char *path, void *data) { - enum object_type type = sha1_object_info(oid->hash, NULL); + enum object_type type = oid_object_info(oid, NULL); if (type < 0) { warning("loose object at %s could not be examined", path); |