GIT 1.0.4

diff --git a/checkout-index.c b/checkout-index.c
index 1e1c9727e0e8568e3e2768ceae8831e993f22b72..53dd8cba6f0c56125545acd46f1091366949f89b 100644 (file)
--- a/checkout-index.c
+++ b/checkout-index.c
@@ -58,7 +58,7 @@ static int checkout_file(const char *name)
 
        while (pos < active_nr) {
                struct cache_entry *ce = active_cache[pos];
-               if (ce_namelen(ce) != namelen &&
+               if (ce_namelen(ce) != namelen ||
                    memcmp(ce->name, name, namelen))
                        break;
                has_same_name = 1;