diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-01-15 23:20:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-01-15 23:20:29 (GMT) |
| commit | 8b327f1784d21c52bc177b5ca75665db388d6367 (patch) | |
| tree | 6a2ac96412bbb0dbc86c9c84ba2c05146dbd0fb7 /pack-bitmap-write.c | |
| parent | 16a8055daebdf95ca4bb97e3efe07e87f588767e (diff) | |
| parent | bc626927575cea80b8bc5fd0dbb6c6439e34e606 (diff) | |
| download | git-8b327f1784d21c52bc177b5ca75665db388d6367.zip git-8b327f1784d21c52bc177b5ca75665db388d6367.tar.gz git-8b327f1784d21c52bc177b5ca75665db388d6367.tar.bz2 | |
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 'pack-bitmap-write.c')
| -rw-r--r-- | pack-bitmap-write.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c index cc5ead9..92460a6 100644 --- a/pack-bitmap-write.c +++ b/pack-bitmap-write.c @@ -9,7 +9,7 @@ #include "pack-revindex.h" #include "pack.h" #include "pack-bitmap.h" -#include "sha1-lookup.h" +#include "hash-lookup.h" #include "pack-objects.h" #include "commit-reach.h" #include "prio-queue.h" @@ -626,7 +626,7 @@ static void write_selected_commits_v1(struct hashfile *f, struct bitmapped_commit *stored = &writer.selected[i]; int commit_pos = - sha1_pos(stored->commit->object.oid.hash, index, index_nr, sha1_access); + hash_pos(stored->commit->object.oid.hash, index, index_nr, sha1_access); if (commit_pos < 0) BUG("trying to write commit not in index"); |