Commit 62993b61 by nulltoken

branches: propagate EEXISTS upon creation

parent 3548fcf5
...@@ -77,12 +77,11 @@ int git_branch_create( ...@@ -77,12 +77,11 @@ int git_branch_create(
if (git_buf_joinpath(&canonical_branch_name, GIT_REFS_HEADS_DIR, branch_name) < 0) if (git_buf_joinpath(&canonical_branch_name, GIT_REFS_HEADS_DIR, branch_name) < 0)
goto cleanup; goto cleanup;
if (git_reference_create_oid(&branch, repository, error = git_reference_create_oid(&branch, repository,
git_buf_cstr(&canonical_branch_name), git_object_id(commit), force) < 0) git_buf_cstr(&canonical_branch_name), git_object_id(commit), force);
goto cleanup;
*ref_out = branch; if (!error)
error = 0; *ref_out = branch;
cleanup: cleanup:
git_object_free(commit); git_object_free(commit);
......
...@@ -50,7 +50,7 @@ void test_refs_branches_create__can_not_create_a_branch_if_its_name_collide_with ...@@ -50,7 +50,7 @@ void test_refs_branches_create__can_not_create_a_branch_if_its_name_collide_with
{ {
retrieve_known_commit(&target, repo); retrieve_known_commit(&target, repo);
cl_git_fail(git_branch_create(&branch, repo, "br2", target, 0)); cl_assert_equal_i(GIT_EEXISTS, git_branch_create(&branch, repo, "br2", target, 0));
} }
void test_refs_branches_create__can_force_create_over_an_existing_branch(void) void test_refs_branches_create__can_force_create_over_an_existing_branch(void)
......
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