X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=notes-merge.c;h=2de27af751476a62dc9b0afe48eb360f83a0702b;hb=d7a10c3140de593abe25d55bbdba43373079e82e;hp=ce10aacf2978024eda0234482964577e9235f2d2;hpb=7b1baed3fbcffbc496a3161c969ba188ac7c6a7d;p=git.git

diff --git a/notes-merge.c b/notes-merge.c
index ce10aacf2..2de27af75 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -573,7 +573,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))