diff options
| author | Jeff King <peff@peff.net> | 2021-01-28 01:12:35 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-01-28 11:21:07 -0800 |
| commit | 98c431b6f9c767657e1c8cb57370fd1db82b341e (patch) | |
| tree | db31752bd7090672b3eea34e694697e80179760c /commit.c | |
| parent | e6362826a0409539642a5738db61827e5978e2e4 (diff) | |
commit_graft_pos(): take an oid instead of a bare hash
All of our callers have an object_id, and are just dereferencing the hash field to pass to us. Let's take the actual object_id instead. We still access the hash to pass to hash_pos, but it's a step in the right direction. This makes the callers slightly simpler, but also gets rid of the untyped pointer, as well as the now-inaccurate name "sha1". Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.c')
| -rw-r--r-- | commit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/commit.c b/commit.c index bab8d5ab07..fa26729ba5 100644 --- a/commit.c +++ b/commit.c @@ -111,9 +111,9 @@ static const unsigned char *commit_graft_sha1_access(size_t index, void *table) return commit_graft_table[index]->oid.hash; } -int commit_graft_pos(struct repository *r, const unsigned char *sha1) +int commit_graft_pos(struct repository *r, const struct object_id *oid) { - return hash_pos(sha1, r->parsed_objects->grafts, + return hash_pos(oid->hash, r->parsed_objects->grafts, r->parsed_objects->grafts_nr, commit_graft_sha1_access); } @@ -121,7 +121,7 @@ int commit_graft_pos(struct repository *r, const unsigned char *sha1) int register_commit_graft(struct repository *r, struct commit_graft *graft, int ignore_dups) { - int pos = commit_graft_pos(r, graft->oid.hash); + int pos = commit_graft_pos(r, &graft->oid); if (0 <= pos) { if (ignore_dups) @@ -232,7 +232,7 @@ struct commit_graft *lookup_commit_graft(struct repository *r, const struct obje { int pos; prepare_commit_graft(r); - pos = commit_graft_pos(r, oid->hash); + pos = commit_graft_pos(r, oid); if (pos < 0) return NULL; return r->parsed_objects->grafts[pos]; |