diff options
| author |  brian m. carlson <sandals@crustytoothpaste.net> | 2017-03-31 01:40:00 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-03-31 08:33:56 -0700 |
| commit | 910650d2f8755359ab7b1f0e2a2d576c06a68091 (patch) | |
| tree | c0ebaef3c66710ea08e1c766ec1553f0105fcc21 /ref-filter.c | |
| parent | Convert sha1_array_for_each_unique and for_each_abbrev to object_id (diff) | |
| download | tgif-910650d2f8755359ab7b1f0e2a2d576c06a68091.tar.xz | |
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 'ref-filter.c')
| -rw-r--r-- | ref-filter.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ref-filter.c b/ref-filter.c index 4ee7ebcda3..fe1abf65ff 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -1677,21 +1677,21 @@ static int filter_pattern_match(struct ref_filter *filter, const char *refname) * the need to parse the object via parse_object(). peel_ref() might be a * more efficient alternative to obtain the pointee. */ -static const struct object_id *match_points_at(struct sha1_array *points_at, +static const struct object_id *match_points_at(struct oid_array *points_at, const struct object_id *oid, const char *refname) { const struct object_id *tagged_oid = NULL; struct object *obj; - if (sha1_array_lookup(points_at, oid) >= 0) + if (oid_array_lookup(points_at, oid) >= 0) return oid; obj = parse_object(oid->hash); if (!obj) die(_("malformed object at '%s'"), refname); if (obj->type == OBJ_TAG) tagged_oid = &((struct tag *)obj)->tagged->oid; - if (tagged_oid && sha1_array_lookup(points_at, tagged_oid) >= 0) + if (tagged_oid && oid_array_lookup(points_at, tagged_oid) >= 0) return tagged_oid; return NULL; } |