X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diffcore-pathspec.c;h=139fe882f9f85575af297a2131cfac2888ae3c73;hb=bdaa085f8c33e75cf477ff6b4292f35c9c5f4c22;hp=c460b2e56d3e6fe26f9e78ba3a877dc5417e8590;hpb=226406f693013ea3eadab258cb5fc9d8e83df916;p=git.git

diff --git a/diffcore-pathspec.c b/diffcore-pathspec.c
index c460b2e5..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;
@@ -22,9 +21,15 @@ 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[i].len;
-		if (! strncmp(s[i].spec, name, len) &&
-		    len <= namelen &&
-		    (name[len] == 0 || name[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,20 +48,18 @@ 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++) {
-		int l;
 		spec[i].spec = pathspec[i];
-		l = strlen(pathspec[i]);
-		while (l > 0 && pathspec[i][l-1] == '/')
-			l--;
-		spec[i].len = l;
+		spec[i].len = strlen(pathspec[i]);
 	}
 
 	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);