From: Junio C Hamano <junkio@cox.net>
Date: Wed, 14 Dec 2005 05:39:56 +0000 (-0800)
Subject: checkout-index: fix checking out specific path.
X-Git-Tag: v0.99.9n^2~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f4f9adaea7e4e46337ae8312f34228a743f0cd89;p=git.git

checkout-index: fix checking out specific path.

3bd348aeea24709cd9be4b9d741f79b6014cd7e3 commit broke checking
out specific paths.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

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