diff options
| author | Russell Belfer <rb@github.com> | 2013-05-01 14:00:20 -0700 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2013-05-01 14:00:20 -0700 |
| commit | de19c4a9582b74eec1d510d4ded5889d3b3e7976 (patch) | |
| tree | cf75ce0ff98035a6c79fe6808d7bdf582046c7c1 /src/merge.c | |
| parent | e830c020f3915e272cf0810899f40dd5c84fbbf6 (diff) | |
| download | libgit2-de19c4a9582b74eec1d510d4ded5889d3b3e7976.tar.gz | |
Set error when no merge base is found
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/merge.c b/src/merge.c index e0010d6a4..48ff80cd4 100644 --- a/src/merge.c +++ b/src/merge.c @@ -86,6 +86,7 @@ int git_merge_base_many(git_oid *out, git_repository *repo, const git_oid input_ goto cleanup; if (!result) { + giterr_set(GITERR_MERGE, "No merge base found"); error = GIT_ENOTFOUND; goto cleanup; } @@ -131,7 +132,7 @@ int git_merge_base(git_oid *out, git_repository *repo, const git_oid *one, const if (!result) { git_revwalk_free(walk); - giterr_clear(); + giterr_set(GITERR_MERGE, "No merge base found"); return GIT_ENOTFOUND; } |