diff --git a/diffcore-pathspec.c b/diffcore-pathspec.c
index fd11822aaf1a543f14f074d6975f5e55ef95c73a..139fe882f9f85575af297a2131cfac2888ae3c73 100644 (file)
--- a/diffcore-pathspec.c
+++ b/diffcore-pathspec.c
#include "cache.h"
#include "diff.h"
#include "diffcore.h"
#include "cache.h"
#include "diff.h"
#include "diffcore.h"
-#include "delta.h"
struct path_spec {
const char *spec;
struct path_spec {
const char *spec;
namelen = strlen(name);
for (i = 0; i < cnt; i++) {
int len = s[i].len;
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;
return 1;
}
return 0;
for (i = 0; pathspec[i]; i++)
;
speccnt = i;
for (i = 0; pathspec[i]; i++)
;
speccnt = i;
+ if (!speccnt)
+ return;
+
spec = xmalloc(sizeof(*spec) * speccnt);
for (i = 0; pathspec[i]; i++) {
spec = xmalloc(sizeof(*spec) * speccnt);
for (i = 0; pathspec[i]; i++) {
- int l;
spec[i].spec = pathspec[i];
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];
}
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_q(&outq, p);
else
- free(p);
+ diff_free_filepair(p);
}
free(q->queue);
*q = outq;
}
free(q->queue);
*q = outq;