X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diffcore-pathspec.c;h=7f18a6ca3c3b096c2e2a9c38716df259866a5458;hb=2cd68882ee8629f9782be017007fff4c78e45e45;hp=4b7adc396a04076dbdd27ab5b9c0d7f420a2986c;hpb=f7c1512af8ff4f821c530f9a4bc8f8ff25733d51;p=git.git

diff --git a/diffcore-pathspec.c b/diffcore-pathspec.c
index 4b7adc39..7f18a6ca 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,8 +20,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;
@@ -45,17 +44,20 @@ void diffcore_pathspec(const char **pathspec)
 	speccnt = i;
 	spec = xmalloc(sizeof(*spec) * speccnt);
 	for (i = 0; pathspec[i]; i++) {
+		int l;
 		spec[i].spec = pathspec[i];
-		spec[i].len = strlen(pathspec[i]);
+		l = strlen(pathspec[i]);
+		while (l > 0 && pathspec[i][l-1] == '/')
+			l--;
+		spec[i].len = l;
 	}
 
 	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;