projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-upload-pack: More efficient usage of the has_sha1 array
[git.git]
/
diffcore-pathspec.c
diff --git
a/diffcore-pathspec.c
b/diffcore-pathspec.c
index
4b7adc3
..
68fe009
100644
(file)
--- a/
diffcore-pathspec.c
+++ b/
diffcore-pathspec.c
@@
-4,7
+4,6
@@
#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;
@@
-21,10
+20,16
@@
static int matches_pathspec(const char *name, struct path_spec *s, int cnt)
namelen = strlen(name);
for (i = 0; i < cnt; i++) {
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;
+ if (!len)
return 1;
}
return 0;
return 1;
}
return 0;
@@
-51,11
+56,10
@@
void diffcore_pathspec(const char **pathspec)
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;