git_branch_delete() should ignore errors from non-existing reflogs

283f31ab · Pierre-Olivier Latour · Carlos Martín Nieto · aa409d53 · 283f31ab
Commit 283f31ab authored Mar 02, 2015 by Pierre-Olivier Latour Committed by Carlos Martín Nieto Mar 21, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletions

src/branch.c
+6 -1

No files found.
--- 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;