mirror of
https://github.com/git/git.git
synced 2024-11-18 16:53:53 +01:00
1d9e6f92bc
Removing (and ignoring) them is wrong, since that means that a pathspec of "xxxx/" would match a regular filename of "xxxx", which is obviously incorrect.
66 lines
1.2 KiB
C
66 lines
1.2 KiB
C
/*
|
|
* Copyright (C) 2005 Junio C Hamano
|
|
*/
|
|
#include "cache.h"
|
|
#include "diff.h"
|
|
#include "diffcore.h"
|
|
|
|
struct path_spec {
|
|
const char *spec;
|
|
int len;
|
|
};
|
|
|
|
static int matches_pathspec(const char *name, struct path_spec *s, int cnt)
|
|
{
|
|
int i;
|
|
int namelen;
|
|
|
|
if (cnt == 0)
|
|
return 1;
|
|
|
|
namelen = strlen(name);
|
|
for (i = 0; i < cnt; i++) {
|
|
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;
|
|
}
|
|
|
|
void diffcore_pathspec(const char **pathspec)
|
|
{
|
|
struct diff_queue_struct *q = &diff_queued_diff;
|
|
int i, speccnt;
|
|
struct diff_queue_struct outq;
|
|
struct path_spec *spec;
|
|
|
|
outq.queue = NULL;
|
|
outq.nr = outq.alloc = 0;
|
|
|
|
for (i = 0; pathspec[i]; i++)
|
|
;
|
|
speccnt = i;
|
|
spec = xmalloc(sizeof(*spec) * speccnt);
|
|
for (i = 0; pathspec[i]; i++) {
|
|
spec[i].spec = pathspec[i];
|
|
spec[i].len = strlen(pathspec[i]);
|
|
}
|
|
|
|
for (i = 0; i < q->nr; i++) {
|
|
struct diff_filepair *p = q->queue[i];
|
|
if (matches_pathspec(p->two->path, spec, speccnt))
|
|
diff_q(&outq, p);
|
|
else
|
|
diff_free_filepair(p);
|
|
}
|
|
free(q->queue);
|
|
*q = outq;
|
|
return;
|
|
}
|