projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Fix count-delta overcounting
[git.git]
/
diffcore-pathspec.c
diff --git
a/diffcore-pathspec.c
b/diffcore-pathspec.c
index
25ab9ed
..
7f18a6c
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,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++) {
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;
len <= namelen &&
(name[len] == 0 || name[len] == '/'))
return 1;
@@
-45,14
+44,17
@@
void diffcore_pathspec(const char **pathspec)
speccnt = i;
spec = xmalloc(sizeof(*spec) * speccnt);
for (i = 0; pathspec[i]; i++) {
speccnt = i;
spec = xmalloc(sizeof(*spec) * speccnt);
for (i = 0; pathspec[i]; i++) {
+ int l;
spec[i].spec = pathspec[i];
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];
}
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);
diff_q(&outq, p);
else
diff_free_filepair(p);