diff --git a/diffcore-pathspec.c b/diffcore-pathspec.c
index 25ab9eda939ad92bb746c2419d083b1e52117a56..a48acbc965d5187fc9abb3ffab4fc9e60d4feac3 100644 (file)
--- a/diffcore-pathspec.c
+++ b/diffcore-pathspec.c
#include "cache.h"
#include "diff.h"
#include "diffcore.h"
-#include "delta.h"
struct path_spec {
const char *spec;
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;
}
return 0;
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);