refs: move current_id before the reflog parameters

Keep the reflog parameters as the last two, as they're the optional
parameters.

diff --git a/include/git2/refs.h b/include/git2/refs.h
index 478878210947a0c1c7e1e9812fc7033f970ee564..a4e44c5432a38b981cb9cb2fb10328012849d179 100644 (file)
--- a/include/git2/refs.h
+++ b/include/git2/refs.h
@@ -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.
@@ -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.

diff --git a/src/refs.c b/src/refs.c
index 3ba4b0a84a3dfdad903ff6c986a3c5ff175da02a..e63796c94281e5b827d899161b2408396dc473fb 100644 (file)
--- a/src/refs.c
+++ b/src/refs.c
@@ -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;
@@ -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(
@@ -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;
@@ -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)
@@ -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)
@@ -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,

diff --git a/tests/refs/races.c b/tests/refs/races.c
index 02d57eff18071ac62082ad09828452ef78d4bf12..643290a8e7b5909a38df20126b0300586b03d450 100644 (file)
--- a/tests/refs/races.c
+++ b/tests/refs/races.c
@@ -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);
@@ -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));
@@ -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);