Merge branch 'sb/diff-color-move-more'

diff --git a/bulk-checkin.c b/bulk-checkin.c
index 9f3b644811cd79b2c93ebf1dcebd711640c18419..409ecb566b3c863e453d10650d1bb21955e2dee3 100644 (file)
--- a/bulk-checkin.c
+++ b/bulk-checkin.c
@@ -72,7 +72,7 @@ static int already_written(struct bulk_checkin_state *state, struct object_id *o
 
        /* 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 */