diff options
| -rw-r--r-- | src/graph.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/graph.c b/src/graph.c index 1c6441140..1c264d997 100644 --- a/src/graph.c +++ b/src/graph.c @@ -180,7 +180,12 @@ 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) + error = git_merge_base(&merge_base, repo, commit, ancestor); + /* No merge-base found, it's not a descendant */ + if (error == GIT_ENOTFOUND) + return 0; + + if (error < 0) return error; return git_oid_equal(&merge_base, ancestor); |