Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/libgit2.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Belfer <rb@github.com>2012-11-30 05:02:27 +0400
committerRussell Belfer <rb@github.com>2012-11-30 05:02:27 +0400
commitd5e44d84983ba199a62ec67f823312584339fae3 (patch)
treec9c1cd5c6ef12dd4ccd40f274f17a3bf4d077e52 /src/merge.c
parentb994bfe3398d797ff8e8bb538eec41602d5e360a (diff)
Fix function name and add real error check
`revwalk.h:commit_lookup()` -> `git_revwalk__commit_lookup()` and make `git_commit_list_parse()` do real error checking that the item in the list is an actual commit object. Also fixed an apparent typo in a test name.
Diffstat (limited to 'src/merge.c')
-rw-r--r--src/merge.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/merge.c b/src/merge.c
index 323b7b877..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;