[PATCH] git-merge-one-file-script: do not misinterpret rm failure.
[git.git] / diffcore-pathspec.c
bloba48acbc965d5187fc9abb3ffab4fc9e60d4feac3
1 /*
2 * Copyright (C) 2005 Junio C Hamano
3 */
4 #include "cache.h"
5 #include "diff.h"
6 #include "diffcore.h"
8 struct path_spec {
9 const char *spec;
10 int len;
13 static int matches_pathspec(const char *name, struct path_spec *s, int cnt)
15 int i;
16 int namelen;
18 if (cnt == 0)
19 return 1;
21 namelen = strlen(name);
22 for (i = 0; i < cnt; i++) {
23 int len = s[i].len;
24 if (namelen < len)
25 continue;
26 if (memcmp(s[i].spec, name, len))
27 continue;
28 if (s[i].spec[len-1] == '/' ||
29 name[len] == 0 ||
30 name[len] == '/')
31 return 1;
33 return 0;
36 void diffcore_pathspec(const char **pathspec)
38 struct diff_queue_struct *q = &diff_queued_diff;
39 int i, speccnt;
40 struct diff_queue_struct outq;
41 struct path_spec *spec;
43 outq.queue = NULL;
44 outq.nr = outq.alloc = 0;
46 for (i = 0; pathspec[i]; i++)
48 speccnt = i;
49 spec = xmalloc(sizeof(*spec) * speccnt);
50 for (i = 0; pathspec[i]; i++) {
51 spec[i].spec = pathspec[i];
52 spec[i].len = strlen(pathspec[i]);
55 for (i = 0; i < q->nr; i++) {
56 struct diff_filepair *p = q->queue[i];
57 if (matches_pathspec(p->two->path, spec, speccnt))
58 diff_q(&outq, p);
59 else
60 diff_free_filepair(p);
62 free(q->queue);
63 *q = outq;
64 return;