diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2018-05-17 22:51:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-17 23:13:10 (GMT) |
| commit | 1f93ecd1ab15800fa98a0ce3efa5166fa642ab80 (patch) | |
| tree | 071d13a08bc4efe98aba7a90190d1e2c303d3ad4 /shallow.c | |
| parent | 3ee37656ee6e6c2510add974af057a9d02d3cf4a (diff) | |
| download | git-1f93ecd1ab15800fa98a0ce3efa5166fa642ab80.zip git-1f93ecd1ab15800fa98a0ce3efa5166fa642ab80.tar.gz git-1f93ecd1ab15800fa98a0ce3efa5166fa642ab80.tar.bz2 | |
commit: add repository argument to lookup_commit_graft
Add a repository argument to allow callers of lookup_commit_graft 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>
Diffstat (limited to 'shallow.c')
| -rw-r--r-- | shallow.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -109,7 +109,7 @@ struct commit_list *get_shallow_commits(struct object_array *heads, int depth, cur_depth++; if ((depth != INFINITE_DEPTH && cur_depth >= depth) || (is_repository_shallow() && !commit->parents && - (graft = lookup_commit_graft(&commit->object.oid)) != NULL && + (graft = lookup_commit_graft(the_repository, &commit->object.oid)) != NULL && graft->nr_parent < 0)) { commit_list_insert(commit, &result); commit->object.flags |= shallow_flag; @@ -398,7 +398,8 @@ void prepare_shallow_info(struct shallow_info *info, struct oid_array *sa) for (i = 0; i < sa->nr; i++) { if (has_object_file(sa->oid + i)) { struct commit_graft *graft; - graft = lookup_commit_graft(&sa->oid[i]); + graft = lookup_commit_graft(the_repository, + &sa->oid[i]); if (graft && graft->nr_parent < 0) continue; info->ours[info->nr_ours++] = i; |