Merge branch 'js/difftool-no-index'

diff --git a/bulk-checkin.c b/bulk-checkin.c
index 409ecb566b3c863e453d10650d1bb21955e2dee3..39ee7d6107c15f3e5e439992bea8a8f3413aae05 100644 (file)
--- a/bulk-checkin.c
+++ b/bulk-checkin.c
@@ -67,7 +67,7 @@ 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 */