Second batch for 2.3 cycle

diff --git a/notes-merge.c b/notes-merge.c
index fd5fae255d2760d6b7895e95cee627b5e28f776e..7eb9d7a0103ad8447e4fde50976a5669a75d8cdd 100644 (file)
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -549,7 +549,7 @@ int notes_merge(struct notes_merge_options *o,
               o->local_ref, o->remote_ref);
 
        /* Dereference o->local_ref into local_sha1 */
-       if (read_ref_full(o->local_ref, local_sha1, 0, NULL))
+       if (read_ref_full(o->local_ref, 0, local_sha1, NULL))
                die("Failed to resolve local notes ref '%s'", o->local_ref);
        else if (!check_refname_format(o->local_ref, 0) &&
                is_null_sha1(local_sha1))