X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=checkout-index.c;h=957b4a86b07062b4cafaf9006bca6f7767b46ecf;hb=80804d0af8f5bfa8ce87b5ef72cd2c5eb64c8f40;hp=1e1c9727e0e8568e3e2768ceae8831e993f22b72;hpb=5e80092f7e6db09a40a62e837ca3f74f0bc5ad73;p=git.git

diff --git a/checkout-index.c b/checkout-index.c
index 1e1c9727e..957b4a86b 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;
@@ -116,6 +116,7 @@ int main(int argc, char **argv)
 	int all = 0;
 
 	prefix = setup_git_directory();
+	git_config(git_default_config);
 	prefix_length = prefix ? strlen(prefix) : 0;
 
 	if (read_cache() < 0) {