diff options
| author | Pierre-Olivier Latour <pol@mac.com> | 2015-03-02 10:24:54 -0800 |
|---|---|---|
| committer | Carlos MartÃn Nieto <cmn@dwim.me> | 2015-03-21 21:12:10 +0100 |
| commit | 283f31ab985d613815ddbff604a26aa9bf6919f1 (patch) | |
| tree | 26d6dc0aac26f5b420cd9cddfca677f0e56a6512 | |
| parent | aa409d531509520a079565601635172fa226a730 (diff) | |
| download | libgit2-283f31ab985d613815ddbff604a26aa9bf6919f1.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; |