From 79863917191aaf513fe93029749f655de361eb43 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Latour Date: Mon, 2 Mar 2015 10:24:54 -0800 Subject: [PATCH] git_branch_delete() should ignore errors from non-existing reflogs --- src/branch.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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;