diff options
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/merge.c b/src/merge.c index c795b808b..1386d0908 100644 --- a/src/merge.c +++ b/src/merge.c @@ -71,14 +71,14 @@ int git_merge_base_many(git_oid *out, git_repository *repo, const git_oid input_ goto cleanup; for (i = 1; i < length; i++) { - commit = commit_lookup(walk, &input_array[i]); + commit = git_revwalk__commit_lookup(walk, &input_array[i]); if (commit == NULL) goto cleanup; git_vector_insert(&list, commit); } - commit = commit_lookup(walk, &input_array[0]); + commit = git_revwalk__commit_lookup(walk, &input_array[0]); if (commit == NULL) goto cleanup; @@ -112,7 +112,7 @@ int git_merge_base(git_oid *out, git_repository *repo, const git_oid *one, const if (git_revwalk_new(&walk, repo) < 0) return -1; - commit = commit_lookup(walk, two); + commit = git_revwalk__commit_lookup(walk, two); if (commit == NULL) goto on_error; @@ -122,7 +122,7 @@ int git_merge_base(git_oid *out, git_repository *repo, const git_oid *one, const list.length = 1; list.contents = contents; - commit = commit_lookup(walk, one); + commit = git_revwalk__commit_lookup(walk, one); if (commit == NULL) goto on_error; @@ -241,4 +241,3 @@ int git_merge__bases_many(git_commit_list **out, git_revwalk *walk, git_commit_l *out = result; return 0; } - |