X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=checkout-index.c;h=53dd8cba6f0c56125545acd46f1091366949f89b;hb=e99fcf96deab45ca81b22948328deb2d8586aa8d;hp=1e1c9727e0e8568e3e2768ceae8831e993f22b72;hpb=3bd348aeea24709cd9be4b9d741f79b6014cd7e3;p=git.git

diff --git a/checkout-index.c b/checkout-index.c
index 1e1c9727..53dd8cba 100644
--- 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;