Merge branch 'bp/read-cache-parallel'

diff --git a/refs/packed-backend.c b/refs/packed-backend.c
index d447a731da0932e60c918030c7cd07a1843dfd35..74e2996e93ad0033bd4650f8dd7d894a46d563b3 100644 (file)
--- a/refs/packed-backend.c
+++ b/refs/packed-backend.c
@@ -1160,7 +1160,7 @@ static int write_with_updates(struct packed_ref_store *refs,
                                                    "reference already exists",
                                                    update->refname);
                                        goto error;
-                               } else if (oidcmp(&update->old_oid, iter->oid)) {
+                               } else if (!oideq(&update->old_oid, iter->oid)) {
                                        strbuf_addf(err, "cannot update ref '%s': "
                                                    "is at %s but expected %s",
                                                    update->refname,