Merge branch 'rs/commit-h-single-parent-cleanup' into next

diff --git a/refs/files-backend.c b/refs/files-backend.c
index 928a655a27bab5ae6cce7e1f8f8c3ee7145e1a48..5cca55510b6a0683f16937215f6056d896c622e0 100644 (file)
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -632,11 +632,11 @@ static int lock_raw_ref(struct files_ref_store *refs,
 
                /*
                 * If the ref did not exist and we are creating it,
-                * make sure there is no existing ref that conflicts
-                * with refname:
+                * make sure there is no existing packed ref that
+                * conflicts with refname:
                 */
                if (refs_verify_refname_available(
-                                   &refs->base, refname,
+                                   refs->packed_ref_store, refname,
                                    extras, skip, err))
                        goto error_return;
        }
@@ -939,7 +939,7 @@ static struct ref_lock *lock_ref_sha1_basic(struct files_ref_store *refs,
         * our refname.
         */
        if (is_null_oid(&lock->old_oid) &&
-           refs_verify_refname_available(&refs->base, refname,
+           refs_verify_refname_available(refs->packed_ref_store, refname,
                                          extras, skip, err)) {
                last_errno = ENOTDIR;
                goto error_return;