Merge branch 'js/doc-patch-text'

[thirdparty/git.git] / builtin / clean.c

diff --git a/builtin/clean.c b/builtin/clean.c
index d5579da716e06f372132f827852b0f49f1e4af1d..851beb7f0debb4322122e9aa40aa642fe4ff9be2 100644 (file)
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -648,7 +648,7 @@ static int filter_by_patterns_cmd(void)
        struct strbuf confirm = STRBUF_INIT;
        struct strbuf **ignore_list;
        struct string_list_item *item;
-       struct exclude_list *el;
+       struct pattern_list *pl;
        int changed = -1, i;
 
        for (;;) {
@@ -671,7 +671,7 @@ static int filter_by_patterns_cmd(void)
                        break;
 
                memset(&dir, 0, sizeof(dir));
-               el = add_exclude_list(&dir, EXC_CMDL, "manual exclude");
+               pl = add_pattern_list(&dir, EXC_CMDL, "manual exclude");
                ignore_list = strbuf_split_max(&confirm, ' ', 0);
 
                for (i = 0; ignore_list[i]; i++) {
@@ -679,7 +679,7 @@ static int filter_by_patterns_cmd(void)
                        if (!ignore_list[i]->len)
                                continue;
 
-                       add_exclude(ignore_list[i]->buf, "", 0, el, -(i+1));
+                       add_pattern(ignore_list[i]->buf, "", 0, pl, -(i+1));
                }
 
                changed = 0;
@@ -901,7 +901,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
        struct pathspec pathspec;
        struct strbuf buf = STRBUF_INIT;
        struct string_list exclude_list = STRING_LIST_INIT_NODUP;
-       struct exclude_list *el;
+       struct pattern_list *pl;
        struct string_list_item *item;
        const char *qname;
        struct option options[] = {
@@ -958,9 +958,9 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
        if (!ignored)
                setup_standard_excludes(&dir);
 
-       el = add_exclude_list(&dir, EXC_CMDL, "--exclude option");
+       pl = add_pattern_list(&dir, EXC_CMDL, "--exclude option");
        for (i = 0; i < exclude_list.nr; i++)
-               add_exclude(exclude_list.items[i].string, "", 0, el, -(i+1));
+               add_pattern(exclude_list.items[i].string, "", 0, pl, -(i+1));
 
        parse_pathspec(&pathspec, 0,
                       PATHSPEC_PREFER_CWD,