diff options
| author | Pierre-Olivier Latour <pol@mac.com> | 2015-03-02 10:24:54 -0800 |
|---|---|---|
| committer | Pierre-Olivier Latour <pol@mac.com> | 2015-03-02 10:24:54 -0800 |
| commit | 79863917191aaf513fe93029749f655de361eb43 (patch) | |
| tree | e654d7bd94458d749917336fb820b536bd2bad96 | |
| parent | c23002c5608037957faf13e21adeb214b01fe30e (diff) | |
| download | libgit2-79863917191aaf513fe93029749f655de361eb43.tar.gz | |
git_branch_delete() should ignore errors from non-existing reflogs
| -rw-r--r-- | src/branch.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/branch.c b/src/branch.c index b4e4b0564..06b93ddca 100644 --- a/src/branch.c +++ b/src/branch.c @@ -138,8 +138,13 @@ int git_branch_delete(git_reference *branch) if (git_reference_delete(branch) < 0) goto on_error; - if (git_reflog_delete(git_reference_owner(branch), git_reference_name(branch)) < 0) + if (git_reflog_delete(git_reference_owner(branch), git_reference_name(branch)) < 0) { + if (error == GIT_ENOTFOUND) { + giterr_clear(); + error = 0; + } goto on_error; + } error = 0; |