diff options
| author | Vicent Martà <vicent@github.com> | 2013-05-06 06:45:53 -0700 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2013-05-06 06:45:53 -0700 |
| commit | 03c28d92d00074f1501cb0d7ce9f5e3e0154a244 (patch) | |
| tree | 64c394dc10a839fd0766a800ff31a1d0236360d6 /src/merge.c | |
| parent | d5e5bbd7193924aa845e107f747a15814a679b10 (diff) | |
| parent | 6e286e8dc59874db30b6fbb0ca5d32d4a2b5642c (diff) | |
| download | libgit2-03c28d92d00074f1501cb0d7ce9f5e3e0154a244.tar.gz | |
Merge pull request #1526 from arrbee/cleanup-error-return-without-msg
Make sure error messages are set for most error returns
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 56290bfad..117af8179 100644 --- a/src/merge.c +++ b/src/merge.c @@ -127,6 +127,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; } @@ -172,7 +173,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; } |