Merge branch 'nd/war-on-nul-in-commit'

[git.git] / notes-merge.c

diff --git a/notes-merge.c b/notes-merge.c
index b5a36ac1587f00c21001840c5bc001b011aed554..0d38a1b17d8399c7acf6355d598f0a50d0ec1d3b 100644 (file)
--- 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))