From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Wed, 15 Dec 2010 15:02:50 +0000 (+0700)
Subject: Convert ce_path_match() to use match_pathspec_depth()
X-Git-Tag: v1.7.5-rc0~68^2~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=898bbd9fb4c749afbddcb8a6b68a64b394366e44;p=git.git

Convert ce_path_match() to use match_pathspec_depth()

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/read-cache.c b/read-cache.c
index 8b2d537f0..7772079ad 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -708,29 +708,7 @@ int ce_same_name(struct cache_entry *a, struct cache_entry *b)
 
 int ce_path_match(const struct cache_entry *ce, const struct pathspec *pathspec)
 {
-	const char *match, *name;
-	const char **ps = pathspec->raw;
-	int len;
-
-	if (!pathspec->nr)
-		return 1;
-
-	len = ce_namelen(ce);
-	name = ce->name;
-	while ((match = *ps++) != NULL) {
-		int matchlen = strlen(match);
-		if (matchlen > len)
-			continue;
-		if (memcmp(name, match, matchlen))
-			continue;
-		if (matchlen && name[matchlen-1] == '/')
-			return 1;
-		if (name[matchlen] == '/' || !name[matchlen])
-			return 1;
-		if (!matchlen)
-			return 1;
-	}
-	return 0;
+	return match_pathspec_depth(pathspec, ce->name, ce_namelen(ce), 0, NULL);
 }
 
 /*