X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=notes-merge.c;h=e33c2c9f165ea3ae883860066aca8f91018d2a75;hb=d5a35c114ab6b4337a1c7598bf75c331d94ee092;hp=e9e41993117ae03ed7c9d1f28081a42b2eee97ca;hpb=8d3c0cb08dff78dfa36544f6bc720ac46cf743aa;p=git.git

diff --git a/notes-merge.c b/notes-merge.c
index e9e419931..e33c2c9f1 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -568,7 +568,7 @@ int notes_merge(struct notes_merge_options *o,
 	       o->local_ref, o->remote_ref);
 
 	/* Dereference o->local_ref into local_sha1 */
-	if (!resolve_ref(o->local_ref, local_sha1, 0, NULL))
+	if (read_ref_full(o->local_ref, local_sha1, 0, 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))