From f4d89f26cec4e2de3abde7fb2ab3aed8840d5435 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 24 May 2005 23:35:38 -0700 Subject: [PATCH] [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 ;) Signed-off-by: Linus Torvalds --- diffcore-pathspec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/diffcore-pathspec.c b/diffcore-pathspec.c index 4b7adc39..78b3cb4c 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; -- 2.11.0