Merge branch 'js/iso8895-test-on-apfs'

diff --git a/bulk-checkin.c b/bulk-checkin.c
index 9f3b644811cd79b2c93ebf1dcebd711640c18419..39ee7d6107c15f3e5e439992bea8a8f3413aae05 100644 (file)
--- a/bulk-checkin.c
+++ b/bulk-checkin.c
@@ -67,12 +67,12 @@ static int already_written(struct bulk_checkin_state *state, struct object_id *o
        int i;
 
        /* The object may already exist in the repository */
-       if (has_sha1_file(oid->hash))
+       if (has_object_file(oid))
                return 1;
 
        /* Might want to keep the list sorted */
        for (i = 0; i < state->nr_written; i++)
-               if (!oidcmp(&state->written[i]->oid, oid))
+               if (oideq(&state->written[i]->oid, oid))
                        return 1;
 
        /* This is a new object we need to keep */