diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-01-15 15:20:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-01-15 15:20:29 -0800 |
| commit | 8b327f1784d21c52bc177b5ca75665db388d6367 (patch) | |
| tree | 6a2ac96412bbb0dbc86c9c84ba2c05146dbd0fb7 /oid-array.c | |
| parent | 16a8055daebdf95ca4bb97e3efe07e87f588767e (diff) | |
| parent | bc626927575cea80b8bc5fd0dbb6c6439e34e606 (diff) | |
| download | git-8b327f1784d21c52bc177b5ca75665db388d6367.tar.xz | |
Merge branch 'ma/sha1-is-a-hash'
Retire more names with "sha1" in it.
* ma/sha1-is-a-hash:
hash-lookup: rename from sha1-lookup
sha1-lookup: rename `sha1_pos()` as `hash_pos()`
object-file.c: rename from sha1-file.c
object-name.c: rename from sha1-name.c
Diffstat (limited to 'oid-array.c')
| -rw-r--r-- | oid-array.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/oid-array.c b/oid-array.c index 8e1bcedc0c..889b311f22 100644 --- a/oid-array.c +++ b/oid-array.c @@ -1,6 +1,6 @@ #include "cache.h" #include "oid-array.h" -#include "sha1-lookup.h" +#include "hash-lookup.h" void oid_array_append(struct oid_array *array, const struct object_id *oid) { @@ -31,7 +31,7 @@ static const unsigned char *sha1_access(size_t index, void *table) int oid_array_lookup(struct oid_array *array, const struct object_id *oid) { oid_array_sort(array); - return sha1_pos(oid->hash, array->oid, array->nr, sha1_access); + return hash_pos(oid->hash, array->oid, array->nr, sha1_access); } void oid_array_clear(struct oid_array *array) |