X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=notes-merge.c;h=ce10aacf2978024eda0234482964577e9235f2d2;hb=bd193f46b70fd3f8a55e2a8dcbb1fb2b4eec13d6;hp=d0e5034da4991777bad8e0a42a45801e0e785b7d;hpb=c9de921848061db9316fe8dc2ebff4bcadf8117f;p=git.git

diff --git a/notes-merge.c b/notes-merge.c
index d0e5034da..ce10aacf2 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -575,7 +575,8 @@ int notes_merge(struct notes_merge_options *o,
 	/* Dereference o->local_ref into local_sha1 */
 	if (!resolve_ref(o->local_ref, local_sha1, 0, NULL))
 		die("Failed to resolve local notes ref '%s'", o->local_ref);
-	else if (!check_ref_format(o->local_ref) && is_null_sha1(local_sha1))
+	else if (!check_refname_format(o->local_ref, 0) &&
+		is_null_sha1(local_sha1))
 		local = NULL; /* local_sha1 == null_sha1 indicates unborn ref */
 	else if (!(local = lookup_commit_reference(local_sha1)))
 		die("Could not parse local commit %s (%s)",
@@ -588,7 +589,7 @@ int notes_merge(struct notes_merge_options *o,
 		 * Failed to get remote_sha1. If o->remote_ref looks like an
 		 * unborn ref, perform the merge using an empty notes tree.
 		 */
-		if (!check_ref_format(o->remote_ref)) {
+		if (!check_refname_format(o->remote_ref, 0)) {
 			hashclr(remote_sha1);
 			remote = NULL;
 		} else {