Merge branch 'mh/split-under-lock'

diff --git a/refs/files-backend.c b/refs/files-backend.c
index bbf96ad83a5abc494fbbd99d2bd9cceef6252e97..4dd72b42c88e4e125ec5fa108d3e81bfc8a44483 100644 (file)
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1929,14 +1929,14 @@ static int verify_lock(struct ref_lock *lock,
                        errno = save_errno;
                        return -1;
                } else {
-                       hashclr(lock->old_oid.hash);
+                       oidclr(&lock->old_oid);
                        return 0;
                }
        }
        if (old_sha1 && hashcmp(lock->old_oid.hash, old_sha1)) {
                strbuf_addf(err, "ref '%s' is at %s but expected %s",
                            lock->ref_name,
-                           sha1_to_hex(lock->old_oid.hash),
+                           oid_to_hex(&lock->old_oid),
                            sha1_to_hex(old_sha1));
                errno = EBUSY;
                return -1;