cocci: apply the "cache.h" part of "the_repository.pending"

[thirdparty/git.git] / notes-merge.c

diff --git a/notes-merge.c b/notes-merge.c
index b4cc594a790965aca297fe87392a50b643e6fb41..d290c7478e27a803c99aebc7558593b51c307553 100644 (file)
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -566,7 +566,7 @@ int notes_merge(struct notes_merge_options *o,
        trace_printf("\tlocal commit: %.7s\n", oid_to_hex(&local_oid));
 
        /* Dereference o->remote_ref into remote_oid */
-       if (get_oid(o->remote_ref, &remote_oid)) {
+       if (repo_get_oid(the_repository, o->remote_ref, &remote_oid)) {
                /*
                 * Failed to get remote_oid. If o->remote_ref looks like an
                 * unborn ref, perform the merge using an empty notes tree.