diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-03-31 03:40:00 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-31 17:33:56 +0200 |
| commit | 910650d2f8755359ab7b1f0e2a2d576c06a68091 (patch) | |
| tree | c0ebaef3c66710ea08e1c766ec1553f0105fcc21 /builtin/pack-objects.c | |
| parent | Convert sha1_array_for_each_unique and for_each_abbrev to object_id (diff) | |
| download | git-910650d2f8755359ab7b1f0e2a2d576c06a68091.tar.xz git-910650d2f8755359ab7b1f0e2a2d576c06a68091.zip | |
Rename sha1_array to oid_array
Since this structure handles an array of object IDs, rename it to struct
oid_array. Also rename the accessor functions and the initialization
constant.
This commit was produced mechanically by providing non-Documentation
files to the following Perl one-liners:
perl -pi -E 's/struct sha1_array/struct oid_array/g'
perl -pi -E 's/\bsha1_array_/oid_array_/g'
perl -pi -E 's/SHA1_ARRAY_INIT/OID_ARRAY_INIT/g'
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 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 028c7be9a2..4fc032e3ec 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -2668,7 +2668,7 @@ static int has_sha1_pack_kept_or_nonlocal(const unsigned char *sha1) * * This is filled by get_object_list. */ -static struct sha1_array recent_objects; +static struct oid_array recent_objects; static int loosened_object_can_be_discarded(const struct object_id *oid, unsigned long mtime) @@ -2677,7 +2677,7 @@ static int loosened_object_can_be_discarded(const struct object_id *oid, return 0; if (mtime > unpack_unreachable_expiration) return 0; - if (sha1_array_lookup(&recent_objects, oid) >= 0) + if (oid_array_lookup(&recent_objects, oid) >= 0) return 0; return 1; } @@ -2739,12 +2739,12 @@ static void record_recent_object(struct object *obj, const char *name, void *data) { - sha1_array_append(&recent_objects, &obj->oid); + oid_array_append(&recent_objects, &obj->oid); } static void record_recent_commit(struct commit *commit, void *data) { - sha1_array_append(&recent_objects, &commit->object.oid); + oid_array_append(&recent_objects, &commit->object.oid); } static void get_object_list(int ac, const char **av) @@ -2812,7 +2812,7 @@ static void get_object_list(int ac, const char **av) if (unpack_unreachable) loosen_unused_packed_objects(&revs); - sha1_array_clear(&recent_objects); + oid_array_clear(&recent_objects); } static int option_parse_index_version(const struct option *opt, |