Merge git://git.kernel.org/pub/scm/gitk/gitk

[git.git] / builtin-clean.c

diff --git a/builtin-clean.c b/builtin-clean.c
index f78c2fb108bc667079290f9b2fa82f47da5eb34c..1c1b6d26e9987800d2a414e49e4f371a4277b96e 100644 (file)
--- a/builtin-clean.c
+++ b/builtin-clean.c
@@ -56,11 +56,12 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
        else
                config_set = 1;
 
-       argc = parse_options(argc, argv, options, builtin_clean_usage, 0);
+       argc = parse_options(argc, argv, prefix, options, builtin_clean_usage,
+                            0);
 
        memset(&dir, 0, sizeof(dir));
        if (ignored_only)
-               dir.show_ignored = 1;
+               dir.flags |= DIR_SHOW_IGNORED;
 
        if (ignored && ignored_only)
                die("-x and -X cannot be used together");
@@ -69,7 +70,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
                die("clean.requireForce%s set and -n or -f not given; "
                    "refusing to clean", config_set ? "" : " not");
 
-       dir.show_other_directories = 1;
+       dir.flags |= DIR_SHOW_OTHER_DIRECTORIES;
 
        if (!ignored)
                setup_standard_excludes(&dir);