Commit c1281493 by Carlos Martín Nieto

refs: propagate EEXISTS

Indicate whether the error comes from the ref already existing or
elsewhere. We always perform the check and this lets the user write
more concise code.
parent 3665ba8e
...@@ -1199,6 +1199,7 @@ int git_reference_create_symbolic( ...@@ -1199,6 +1199,7 @@ int git_reference_create_symbolic(
{ {
char normalized[GIT_REFNAME_MAX]; char normalized[GIT_REFNAME_MAX];
git_reference *ref = NULL; git_reference *ref = NULL;
int error;
if (git_reference__normalize_name_lax( if (git_reference__normalize_name_lax(
normalized, normalized,
...@@ -1206,8 +1207,8 @@ int git_reference_create_symbolic( ...@@ -1206,8 +1207,8 @@ int git_reference_create_symbolic(
name) < 0) name) < 0)
return -1; return -1;
if (reference_can_write(repo, normalized, NULL, force) < 0) if ((error = reference_can_write(repo, normalized, NULL, force)) < 0)
return -1; return error;
if (reference_alloc(&ref, repo, normalized) < 0) if (reference_alloc(&ref, repo, normalized) < 0)
return -1; return -1;
...@@ -1236,6 +1237,7 @@ int git_reference_create_oid( ...@@ -1236,6 +1237,7 @@ int git_reference_create_oid(
const git_oid *id, const git_oid *id,
int force) int force)
{ {
int error;
git_reference *ref = NULL; git_reference *ref = NULL;
char normalized[GIT_REFNAME_MAX]; char normalized[GIT_REFNAME_MAX];
...@@ -1245,8 +1247,8 @@ int git_reference_create_oid( ...@@ -1245,8 +1247,8 @@ int git_reference_create_oid(
name) < 0) name) < 0)
return -1; return -1;
if (reference_can_write(repo, normalized, NULL, force) < 0) if ((error = reference_can_write(repo, normalized, NULL, force)) < 0)
return -1; return error;
if (reference_alloc(&ref, repo, name) < 0) if (reference_alloc(&ref, repo, name) < 0)
return -1; return -1;
......
...@@ -147,3 +147,18 @@ void test_refs_create__oid_unknown(void) ...@@ -147,3 +147,18 @@ void test_refs_create__oid_unknown(void)
/* Ensure the reference can't be looked-up... */ /* Ensure the reference can't be looked-up... */
cl_git_fail(git_reference_lookup(&looked_up_ref, g_repo, new_head)); cl_git_fail(git_reference_lookup(&looked_up_ref, g_repo, new_head));
} }
void test_refs_create__propagate_eexists(void)
{
int error;
git_oid oid;
git_reference *ref;
/* Make sure it works for oid and for symbolic both */
git_oid_fromstr(&oid, current_master_tip);
error = git_reference_create_oid(&ref, g_repo, current_head_target, &oid, false);
cl_assert(error == GIT_EEXISTS);
error = git_reference_create_symbolic(&ref, g_repo, "HEAD", current_head_target, false);
cl_assert(error == GIT_EEXISTS);
}
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