Commit 2795fb4d by Vicent Marti

Merge pull request #2256 from jacquesg/graph-descendant

Correct grouping of parentheses
parents 5f74c476 8a8e3127
......@@ -180,7 +180,7 @@ int git_graph_descendant_of(git_repository *repo, const git_oid *commit, const g
if (git_oid_equal(commit, ancestor))
return 0;
if ((error = git_merge_base(&merge_base, repo, commit, ancestor) < 0))
if ((error = git_merge_base(&merge_base, repo, commit, ancestor)) < 0)
return error;
return git_oid_equal(&merge_base, ancestor);
......
......@@ -45,3 +45,11 @@ void test_graph_descendant_of__returns_correct_result(void)
git_commit_free(other);
}
void test_graph_descendant_of__nopath(void)
{
git_oid oid;
git_oid_fromstr(&oid, "e90810b8df3e80c413d903f631643c716887138d");
cl_assert_equal_i(0, git_graph_descendant_of(_repo, git_commit_id(commit), &oid));
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment