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 /commit-graph.c | |
| parent | 16a8055daebdf95ca4bb97e3efe07e87f588767e (diff) | |
| parent | bc626927575cea80b8bc5fd0dbb6c6439e34e606 (diff) | |
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 'commit-graph.c')
| -rw-r--r-- | commit-graph.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/commit-graph.c b/commit-graph.c index 06f8dc1d89..e9124d4a41 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -7,7 +7,7 @@ #include "object.h" #include "refs.h" #include "revision.h" -#include "sha1-lookup.h" +#include "hash-lookup.h" #include "commit-graph.h" #include "object-store.h" #include "alloc.h" @@ -1043,7 +1043,7 @@ static int write_graph_chunk_data(struct hashfile *f, if (!parent) edge_value = GRAPH_PARENT_NONE; else { - edge_value = sha1_pos(parent->item->object.oid.hash, + edge_value = hash_pos(parent->item->object.oid.hash, ctx->commits.list, ctx->commits.nr, commit_to_sha1); @@ -1074,7 +1074,7 @@ static int write_graph_chunk_data(struct hashfile *f, else if (parent->next) edge_value = GRAPH_EXTRA_EDGES_NEEDED | num_extra_edges; else { - edge_value = sha1_pos(parent->item->object.oid.hash, + edge_value = hash_pos(parent->item->object.oid.hash, ctx->commits.list, ctx->commits.nr, commit_to_sha1); @@ -1143,7 +1143,7 @@ static int write_graph_chunk_extra_edges(struct hashfile *f, /* Since num_parents > 2, this initializer is safe. */ for (parent = (*list)->parents->next; parent; parent = parent->next) { - int edge_value = sha1_pos(parent->item->object.oid.hash, + int edge_value = hash_pos(parent->item->object.oid.hash, ctx->commits.list, ctx->commits.nr, commit_to_sha1); |