Skip to content

Commit

Permalink
refs: move current_id before the reflog parameters
Browse files Browse the repository at this point in the history 
Keep the reflog parameters as the last two, as they're the optional
parameters.
  • Loading branch information
@carlosmn
carlosmn committed Feb 10, 2014
1 parent 77ad675 commit 15284a2
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
8 changes: 4 additions & 4 deletions include/git2/refs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,12 @@ GIT_EXTERN(int) git_reference_dwim(git_reference **out, git_repository *repo, co
* @param name The name of the reference
* @param target The target of the reference
* @param force Overwrite existing references
* @param current_value The expected value of the reference when updating
* @param signature The identity that will used to populate the reflog entry
* @param log_message The one line long message to be appended to the reflog
* @param current_value The expected value of the reference when updating
* @return 0 on success, GIT_EEXISTS, GIT_EINVALIDSPEC, GIT_EMODIFIED or an error code
*/
GIT_EXTERN(int) git_reference_symbolic_create_matching(git_reference **out, git_repository *repo, const char *name, const char *target, int force, const git_signature *signature, const char *log_message, const char *current_value);
GIT_EXTERN(int) git_reference_symbolic_create_matching(git_reference **out, git_repository *repo, const char *name, const char *target, int force, const char *current_value, const git_signature *signature, const char *log_message);

/**
* Create a new symbolic reference.
Expand Down Expand Up @@ -222,13 +222,13 @@ GIT_EXTERN(int) git_reference_create(git_reference **out, git_repository *repo,
* @param id The object id pointed to by the reference.
* @param force Overwrite existing references
* @param force Overwrite existing references
* @param current_id The expected value of the reference at the time of update
* @param signature The identity that will used to populate the reflog entry
* @param log_message The one line long message to be appended to the reflog
* @param current_id The expected value of the reference at the time of update
* @return 0 on success, GIT_EMODIFIED if the value of the reference
* has changed, GIT_EEXISTS, GIT_EINVALIDSPEC or an error code
*/
GIT_EXTERN(int) git_reference_create_matching(git_reference **out, git_repository *repo, const char *name, const git_oid *id, int force, const git_signature *signature, const char *log_message, const git_oid *current_id);
GIT_EXTERN(int) git_reference_create_matching(git_reference **out, git_repository *repo, const char *name, const git_oid *id, int force, const git_oid *current_id, const git_signature *signature, const char *log_message);

/**
* Get the OID pointed to by a direct reference.
Expand Down
16 changes: 8 additions & 8 deletions src/refs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,9 +433,9 @@ int git_reference_create_matching(
const char *name,
const git_oid *id,
int force,
const git_oid *old_id,
const git_signature *signature,
const char *log_message,
const git_oid *old_id)
const char *log_message)

{
int error;
Expand Down Expand Up @@ -466,7 +466,7 @@ int git_reference_create(
const git_signature *signature,
const char *log_message)
{
return git_reference_create_matching(ref_out, repo, name, id, force, signature, log_message, NULL);
return git_reference_create_matching(ref_out, repo, name, id, force, NULL, signature, log_message);
}

int git_reference_symbolic_create_matching(
Expand All @@ -475,9 +475,9 @@ int git_reference_symbolic_create_matching(
const char *name,
const char *target,
int force,
const char *old_target,
const git_signature *signature,
const char *log_message,
const char *old_target)
const char *log_message)
{
int error;
git_signature *who = NULL;
Expand Down Expand Up @@ -507,7 +507,7 @@ int git_reference_symbolic_create(
const git_signature *signature,
const char *log_message)
{
return git_reference_symbolic_create_matching(ref_out, repo, name, target, force, signature, log_message, NULL);
return git_reference_symbolic_create_matching(ref_out, repo, name, target, force, NULL, signature, log_message);
}

static int ensure_is_an_updatable_direct_reference(git_reference *ref)
Expand Down Expand Up @@ -536,7 +536,7 @@ int git_reference_set_target(
if ((error = ensure_is_an_updatable_direct_reference(ref)) < 0)
return error;

return git_reference_create_matching(out, repo, ref->name, id, 1, signature, log_message, &ref->target.oid);
return git_reference_create_matching(out, repo, ref->name, id, 1, &ref->target.oid, signature, log_message);
}

static int ensure_is_an_updatable_symbolic_reference(git_reference *ref)
Expand All @@ -563,7 +563,7 @@ int git_reference_symbolic_set_target(
return error;

return git_reference_symbolic_create_matching(
out, ref->db->repo, ref->name, target, 1, signature, log_message, ref->target.symbolic);
out, ref->db->repo, ref->name, target, 1, ref->target.symbolic, signature, log_message);
}

static int reference__rename(git_reference **out, git_reference *ref, const char *new_name, int force,
Expand Down
8 changes: 4 additions & 4 deletions tests/refs/races.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ void test_refs_races__create_matching(void)
git_oid_fromstr(&id, commit_id);
git_oid_fromstr(&other_id, other_commit_id);

cl_git_fail_with(GIT_EMODIFIED, git_reference_create_matching(&ref, g_repo, refname, &other_id, 1, NULL, NULL, &other_id));
cl_git_fail_with(GIT_EMODIFIED, git_reference_create_matching(&ref, g_repo, refname, &other_id, 1, &other_id, NULL, NULL));

cl_git_pass(git_reference_lookup(&ref, g_repo, refname));
cl_git_pass(git_reference_create_matching(&ref2, g_repo, refname, &other_id, 1, NULL, NULL, &id));
cl_git_pass(git_reference_create_matching(&ref2, g_repo, refname, &other_id, 1, &id, NULL, NULL));
cl_git_fail_with(GIT_EMODIFIED, git_reference_set_target(&ref3, ref, &other_id, NULL, NULL));

git_reference_free(ref);
Expand All @@ -49,7 +49,7 @@ void test_refs_races__symbolic_create_matching(void)
git_oid_fromstr(&id, commit_id);
git_oid_fromstr(&other_id, other_commit_id);

cl_git_fail_with(GIT_EMODIFIED, git_reference_symbolic_create_matching(&ref, g_repo, "HEAD", other_refname, 1, NULL, NULL, other_refname));
cl_git_fail_with(GIT_EMODIFIED, git_reference_symbolic_create_matching(&ref, g_repo, "HEAD", other_refname, 1, other_refname, NULL, NULL));

cl_git_pass(git_reference_lookup(&ref, g_repo, "HEAD"));
cl_git_pass(git_reference_symbolic_create_matching(&ref2, g_repo, "HEAD", other_refname, 1, NULL, NULL, refname));
Expand Down Expand Up @@ -86,7 +86,7 @@ void test_refs_races__delete(void)

/* We cannot delete an oid value that doesn't match */
cl_git_pass(git_reference_lookup(&ref, g_repo, refname));
cl_git_pass(git_reference_create_matching(&ref2, g_repo, refname, &other_id, 1, NULL, NULL, &id));
cl_git_pass(git_reference_create_matching(&ref2, g_repo, refname, &other_id, 1, &id, NULL, NULL));
cl_git_fail_with(GIT_EMODIFIED, git_reference_delete(ref));

git_reference_free(ref);
Expand Down

0 comments on commit 15284a2

Please sign in to comment.