mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-04-27 14:05:10 +02:00
Code

commit: allow lookup_commit_graft to handle arbitrary repositories 

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stefan Beller 2018-05-17 15:51:54 -07:00 committed by Junio C Hamano
parent 2f6c767fd4
commit b9dbddf6da
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
commit.c
View File

@ -209,14 +209,14 @@ static void prepare_commit_graft(struct repository *r)
r->parsed_objects->commit_graft_prepared = 1;
}
struct commit_graft *lookup_commit_graft_the_repository(const struct object_id *oid)
struct commit_graft *lookup_commit_graft(struct repository *r, const struct object_id *oid)
{
int pos;
prepare_commit_graft(the_repository);
pos = commit_graft_pos(the_repository, oid->hash);
prepare_commit_graft(r);
pos = commit_graft_pos(r, oid->hash);
if (pos < 0)
return NULL;
return the_repository->parsed_objects->grafts[pos];
return r->parsed_objects->grafts[pos];
}
int for_each_commit_graft(each_commit_graft_fn fn, void *cb_data)

3
commit.h
View File

@ -175,8 +175,7 @@ typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
struct commit_graft *read_graft_line(struct strbuf *line);
int register_commit_graft(struct repository *r, struct commit_graft *, int);
#define lookup_commit_graft(r, o) lookup_commit_graft_##r(o)
struct commit_graft *lookup_commit_graft_the_repository(const struct object_id *oid);
struct commit_graft *lookup_commit_graft(struct repository *r, const struct object_id *oid);
extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2);
extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos);