[PATCH] Optimize diff-tree -[CM] --stdin

diff --git a/diffcore-pathspec.c b/diffcore-pathspec.c
index 78b3cb4c0a61f029bf6ccc3977933c2bef3303e3..0392d66a55dc425d113d8969c33ccbe7d3c1497e 100644 (file)
--- a/diffcore-pathspec.c
+++ b/diffcore-pathspec.c
@@ -45,17 +45,20 @@ void diffcore_pathspec(const char **pathspec)
        speccnt = i;
        spec = xmalloc(sizeof(*spec) * speccnt);
        for (i = 0; pathspec[i]; i++) {
+               int l;
                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];
-               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
-                       free(p);
+                       diff_free_filepair(p);
        }
        free(q->queue);
        *q = outq;