X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diffcore-pathspec.c;h=139fe882f9f85575af297a2131cfac2888ae3c73;hb=687dd75c95f9212244b6cf4fe60b40db44de01ba;hp=25ab9eda939ad92bb746c2419d083b1e52117a56;hpb=6b14d7faf0bad026a81a27bac07b47691f621b8f;p=git.git

diff --git a/diffcore-pathspec.c b/diffcore-pathspec.c
index 25ab9eda..139fe882 100644
--- a/diffcore-pathspec.c
+++ b/diffcore-pathspec.c
@@ -4,7 +4,6 @@
 #include "cache.h"
 #include "diff.h"
 #include "diffcore.h"
-#include "delta.h"
 
 struct path_spec {
 	const char *spec;
@@ -21,10 +20,16 @@ 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) &&
-		    len <= namelen &&
-		    (name[len] == 0 || name[len] == '/'))
+		int len = s[i].len;
+		if (namelen < len)
+			continue;
+		if (memcmp(s[i].spec, name, len))
+			continue;
+		if (s[i].spec[len-1] == '/' ||
+		    name[len] == 0 ||
+		    name[len] == '/')
+			return 1;
+		if (!len)
 			return 1;
 	}
 	return 0;
@@ -43,6 +48,9 @@ void diffcore_pathspec(const char **pathspec)
 	for (i = 0; pathspec[i]; i++)
 		;
 	speccnt = i;
+	if (!speccnt)
+		return;
+
 	spec = xmalloc(sizeof(*spec) * speccnt);
 	for (i = 0; pathspec[i]; i++) {
 		spec[i].spec = pathspec[i];
@@ -51,8 +59,7 @@ void diffcore_pathspec(const char **pathspec)
 
 	for (i = 0; i < q->nr; i++) {
 		struct diff_filepair *p = q->queue[i];
-		if (matches_pathspec(p->one->path, spec, speccnt) ||
-		    matches_pathspec(p->two->path, spec, speccnt))
+		if (matches_pathspec(p->two->path, spec, speccnt))
 			diff_q(&outq, p);
 		else
 			diff_free_filepair(p);