diff options
| -rw-r--r-- | src/branch.c | 8 | ||||
| -rw-r--r-- | tests-clar/refs/branches/delete.c | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/branch.c b/src/branch.c index d0bd1c45b..d9fa9eb97 100644 --- a/src/branch.c +++ b/src/branch.c @@ -265,13 +265,19 @@ int git_branch_is_head( { git_reference *head; bool is_same = false; + int error; assert(branch); if (!git_reference_is_branch(branch)) return false; - if (git_repository_head(&head, git_reference_owner(branch)) < 0) + error = git_repository_head(&head, git_reference_owner(branch)); + + if (error == GIT_ENOTFOUND) + return false; + + if (error < 0) return -1; is_same = strcmp( diff --git a/tests-clar/refs/branches/delete.c b/tests-clar/refs/branches/delete.c index b261240cd..1a97dc822 100644 --- a/tests-clar/refs/branches/delete.c +++ b/tests-clar/refs/branches/delete.c @@ -38,17 +38,16 @@ void test_refs_branches_delete__can_not_delete_a_branch_pointed_at_by_HEAD(void) git_reference_free(branch); } -void test_refs_branches_delete__can_not_delete_a_branch_if_HEAD_is_missing(void) +void test_refs_branches_delete__can_delete_a_branch_even_if_HEAD_is_missing(void) { git_reference *head; - git_reference *branch = NULL; + git_reference *branch; cl_git_pass(git_reference_lookup(&head, repo, GIT_HEAD_FILE)); git_reference_delete(head); cl_git_pass(git_branch_lookup(&branch, repo, "br2", GIT_BRANCH_LOCAL)); - cl_git_fail(git_branch_delete(branch)); - git_reference_free(branch); + cl_git_pass(git_branch_delete(branch)); } void test_refs_branches_delete__can_delete_a_branch_pointed_at_by_detached_HEAD(void) |