Merge branch 'nd/gitignore-trailing-whitespace'

diff --git a/builtin/notes.c b/builtin/notes.c
index 67d0bb14f8f18003d6a073b0c264f5b46ca12685..68b6cd8cc1ded390df592e1c6536d70bf1ffc8a0 100644 (file)
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -702,7 +702,7 @@ static int merge_commit(struct notes_merge_options *o)
        init_notes(t, "NOTES_MERGE_PARTIAL", combine_notes_overwrite, 0);
 
        o->local_ref = local_ref_to_free =
-               resolve_refdup("NOTES_MERGE_REF", sha1, 0, NULL);
+               resolve_refdup("NOTES_MERGE_REF", 0, sha1, NULL);
        if (!o->local_ref)
                die("Failed to resolve NOTES_MERGE_REF");