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>
Jeff King committed
Jan 28, 2021 at 01:12 UTC
98c431b6f9c767657e1c8cb57370fd1db82b341e
3 files changed
+6
-6
commit.c
+4
-4
@@ -111,9 +111,9 @@ static const unsigned char *commit_graft_sha1_access(size_t index, void *table)
111
return commit_graft_table[index]->oid.hash;
112
}
113
114
-int commit_graft_pos(struct repository *r, const unsigned char *sha1)
114
+int commit_graft_pos(struct repository *r, const struct object_id *oid)
115
{
116
- return hash_pos(sha1, r->parsed_objects->grafts,
116
+ return hash_pos(oid->hash, r->parsed_objects->grafts,
117
r->parsed_objects->grafts_nr,
118
commit_graft_sha1_access);
119
}
@@ -121,7 +121,7 @@ int commit_graft_pos(struct repository *r, const unsigned char *sha1)
121
int register_commit_graft(struct repository *r, struct commit_graft *graft,
122
int ignore_dups)
123
{
124
- int pos = commit_graft_pos(r, graft->oid.hash);
124
+ int pos = commit_graft_pos(r, &graft->oid);
125
126
if (0 <= pos) {
127
if (ignore_dups)
@@ -232,7 +232,7 @@ struct commit_graft *lookup_commit_graft(struct repository *r, const struct obje
232
{
233
int pos;
234
prepare_commit_graft(r);
235
- pos = commit_graft_pos(r, oid->hash);
235
+ pos = commit_graft_pos(r, oid);
236
if (pos < 0)
237
return NULL;
238
return r->parsed_objects->grafts[pos];
commit.h
+1
-1
@@ -239,7 +239,7 @@ typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
239
240
struct commit_graft *read_graft_line(struct strbuf *line);
241
/* commit_graft_pos returns an index into r->parsed_objects->grafts. */
242
-int commit_graft_pos(struct repository *r, const unsigned char *sha1);
242
+int commit_graft_pos(struct repository *r, const struct object_id *oid);
243
int register_commit_graft(struct repository *r, struct commit_graft *, int);
244
void prepare_commit_graft(struct repository *r);
245
struct commit_graft *lookup_commit_graft(struct repository *r, const struct object_id *oid);
shallow.c
+1
-1
@@ -41,7 +41,7 @@ int register_shallow(struct repository *r, const struct object_id *oid)
41
42
int unregister_shallow(const struct object_id *oid)
43
{
44
- int pos = commit_graft_pos(the_repository, oid->hash);
44
+ int pos = commit_graft_pos(the_repository, oid);
45
if (pos < 0)
46
return -1;
47
if (pos + 1 < the_repository->parsed_objects->grafts_nr)