Commit 5ac2b7cb by Carlos Martín Nieto

Merge pull request #2937 from git-up/branch_delete_reflog

git_branch_delete() should ignore errors from non-existing reflogs
parents bf410446 79863917
...@@ -138,8 +138,13 @@ int git_branch_delete(git_reference *branch) ...@@ -138,8 +138,13 @@ int git_branch_delete(git_reference *branch)
if (git_reference_delete(branch) < 0) if (git_reference_delete(branch) < 0)
goto on_error; 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; goto on_error;
}
error = 0; error = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment