diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2014-02-10 14:52:28 +0100 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2014-02-10 14:52:28 +0100 |
| commit | 15284a2c5a9185171bfd3acf18b6ab38a032c7af (patch) | |
| tree | f885185da9a3ad18b4115994a333963a4f5dcdee /src/refs.c | |
| parent | 77ad67546492f6ebe2bf53efc867d040bcd2a6a1 (diff) | |
| download | libgit2-15284a2c5a9185171bfd3acf18b6ab38a032c7af.tar.gz | |
refs: move current_id before the reflog parameters
Keep the reflog parameters as the last two, as they're the optional
parameters.
Diffstat (limited to 'src/refs.c')
| -rw-r--r-- | src/refs.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/refs.c b/src/refs.c index 3ba4b0a84..e63796c94 100644 --- 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, |