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>
This commit is contained in:
committed by
Junio C Hamano
parent
e6362826a0
commit
98c431b6f9
@@ -41,7 +41,7 @@ int register_shallow(struct repository *r, const struct object_id *oid)
|
||||
|
||||
int unregister_shallow(const struct object_id *oid)
|
||||
{
|
||||
int pos = commit_graft_pos(the_repository, oid->hash);
|
||||
int pos = commit_graft_pos(the_repository, oid);
|
||||
if (pos < 0)
|
||||
return -1;
|
||||
if (pos + 1 < the_repository->parsed_objects->grafts_nr)
|
||||
|
||||
Reference in New Issue
Block a user