Merge branch 'jk/pack-objects-with-bitmap-fix'

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 67a83fb95bb5a11acef857bdcd4e07535bb3f073..b30b48767e54a93f18ef0d341a04f14cc390e9a9 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -102,7 +102,7 @@ static int update_some(const struct object_id *oid, struct strbuf *base,
        if (pos >= 0) {
                struct cache_entry *old = active_cache[pos];
                if (ce->ce_mode == old->ce_mode &&
-                   !oidcmp(&ce->oid, &old->oid)) {
+                   oideq(&ce->oid, &old->oid)) {
                        old->ce_flags |= CE_UPDATE;
                        discard_cache_entry(ce);
                        return 0;