Merge branch 'jk/config-include'

diff --git a/builtin/notes.c b/builtin/notes.c
index 9d54934d6c4ccf55ed24304a3da5a6fd0f0206ca..ed6f2222f4bf9c54535a7a23971c7749ca8d05d5 100644 (file)
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -809,7 +809,7 @@ static int merge(int argc, const char **argv, const char *prefix)
 
        o.local_ref = default_notes_ref();
        strbuf_addstr(&remote_ref, argv[0]);
-       expand_notes_ref(&remote_ref);
+       expand_loose_notes_ref(&remote_ref);
        o.remote_ref = remote_ref.buf;
 
        t = init_notes_check("merge", NOTES_INIT_WRITABLE);