undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commit: add repository argument to commit_graft_pos

Browse Source 
Add a repository argument to allow callers of commit_graft_pos to be
more specific about which repository to handle. This is a small
mechanical change; it doesn't change the implementation to handle
repositories other than the_repository yet.

As with the previous commits, use a macro to catch callers passing a
repository other than the_repository at compile time.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder 2018-05-15 16:42:17 -07:00 committed by Junio C Hamano
parent 6a1a79fd14
commit be479e801d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
commit.c
View File

@ -104,7 +104,8 @@ static const unsigned char *commit_graft_sha1_access(size_t index, void *table)
return commit_graft_table[index]->oid.hash; return commit_graft_table[index]->oid.hash;
} }
static int commit_graft_pos(const unsigned char *sha1) #define commit_graft_pos(r, s) commit_graft_pos_##r(s)
static int commit_graft_pos_the_repository(const unsigned char *sha1)
{ {
return sha1_pos(sha1, the_repository->parsed_objects->grafts, return sha1_pos(sha1, the_repository->parsed_objects->grafts,
the_repository->parsed_objects->grafts_nr, the_repository->parsed_objects->grafts_nr,
@ -113,7 +114,7 @@ static int commit_graft_pos(const unsigned char *sha1)
int register_commit_graft(struct commit_graft *graft, int ignore_dups) int register_commit_graft(struct commit_graft *graft, int ignore_dups)
{ {
int pos = commit_graft_pos(graft->oid.hash); int pos = commit_graft_pos(the_repository, graft->oid.hash);
if (0 <= pos) { if (0 <= pos) {
if (ignore_dups) if (ignore_dups)
@ -213,7 +214,7 @@ struct commit_graft *lookup_commit_graft(const struct object_id *oid)
{ {
int pos; int pos;
prepare_commit_graft(); prepare_commit_graft();
pos = commit_graft_pos(oid->hash); pos = commit_graft_pos(the_repository, oid->hash);
if (pos < 0) if (pos < 0)
return NULL; return NULL;
return the_repository->parsed_objects->grafts[pos]; return the_repository->parsed_objects->grafts[pos];
@ -229,7 +230,7 @@ int for_each_commit_graft(each_commit_graft_fn fn, void *cb_data)
int unregister_shallow(const struct object_id *oid) int unregister_shallow(const struct object_id *oid)
{ {
int pos = commit_graft_pos(oid->hash); int pos = commit_graft_pos(the_repository, oid->hash);
if (pos < 0) if (pos < 0)
return -1; return -1;
if (pos + 1 < the_repository->parsed_objects->grafts_nr) if (pos + 1 < the_repository->parsed_objects->grafts_nr)