X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diffcore-pathspec.c;h=a48acbc965d5187fc9abb3ffab4fc9e60d4feac3;hb=8037d1a31a60e9645c56a8bebb01d0e13970b93f;hp=78b3cb4c0a61f029bf6ccc3977933c2bef3303e3;hpb=f4d89f26cec4e2de3abde7fb2ab3aed8840d5435;p=git.git

diff --git a/diffcore-pathspec.c b/diffcore-pathspec.c
index 78b3cb4c..a48acbc9 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,13 @@ 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;
 	}
 	return 0;
@@ -51,11 +54,10 @@ 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
-			free(p);
+			diff_free_filepair(p);
 	}
 	free(q->queue);
 	*q = outq;