From: Junio C Hamano <junkio@cox.net>
Date: Wed, 25 May 2005 06:35:38 +0000 (-0700)
Subject: [PATCH] Use pathspec array correctly
X-Git-Tag: v0.99~465
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f4d89f26cec4e2de3abde7fb2ab3aed8840d5435;p=git.git

[PATCH] Use pathspec array correctly

Oh, I am an idiot.  Repeating the same check against the first
element of pathspec array as many times as the pathspec array
has elements in it would not do us any good.

This patch allows you to specify more than one pathspec to
diff-tree family and have them actually used.

Signed-off-by: Junio C Hamano <junkio@cox.net>
;)
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/diffcore-pathspec.c b/diffcore-pathspec.c
index 4b7adc396..78b3cb4c0 100644
--- a/diffcore-pathspec.c
+++ b/diffcore-pathspec.c
@@ -21,8 +21,8 @@ static int matches_pathspec(const char *name, struct path_spec *s, int cnt)
 
 	namelen = strlen(name);
 	for (i = 0; i < cnt; i++) {
-		int len = s->len;
-		if (! strncmp(s->spec, name, len) &&
+		int len = s[i].len;
+		if (! strncmp(s[i].spec, name, len) &&
 		    len <= namelen &&
 		    (name[len] == 0 || name[len] == '/'))
 			return 1;