Add -e/--exclude to git-clean.

With the -e/--exclude option for git-clean, a user can specify files
that they haven't yet told git about, but either need for a short amount
of time or plan to tell git about them later. This allows one to still
use git-clean while these files are around without losing data.

Signed-off-by: Jared Hance <jaredhance@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt
index a81cb6c28050e83778f11f2957d3489f50fa6004..60e38e6e275f5cf90a1ccba36dd3930cafa1b630 100644 (file)
--- a/Documentation/git-clean.txt
+++ b/Documentation/git-clean.txt
@@ -8,7 +8,7 @@ git-clean - Remove untracked files from the working tree
 SYNOPSIS
 --------
 [verse]
 SYNOPSIS
 --------
 [verse]

-'git clean' [-d] [-f] [-n] [-q] [-x | -X] [--] <path>...
+'git clean' [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <path>...

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -45,6 +45,12 @@ OPTIONS
        Be quiet, only report errors, but not the files that are
        successfully removed.
 
        Be quiet, only report errors, but not the files that are
        successfully removed.
 

+-e <pattern>::
+--exclude=<pattern>::
+       Specify special exceptions to not be cleaned.  Each <pattern> is
+       the same form as in $GIT_DIR/info/excludes and this option can be
+       given multiple times.
+

 -x::
        Don't use the ignore rules.  This allows removing all untracked
        files, including build products.  This can be used (possibly in
 -x::
        Don't use the ignore rules.  This allows removing all untracked
        files, including build products.  This can be used (possibly in

diff --git a/builtin/clean.c b/builtin/clean.c
index fac64e6cd3717dfffb0f54124de9545f7cdc391a..b508d2cab482dffc97be1e8ee0481a6bb6157cf2 100644 (file)
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -10,12 +10,13 @@
 #include "cache.h"
 #include "dir.h"
 #include "parse-options.h"
 #include "cache.h"
 #include "dir.h"
 #include "parse-options.h"

+#include "string-list.h"

 #include "quote.h"
 
 static int force = -1; /* unset */
 
 static const char *const builtin_clean_usage[] = {
 #include "quote.h"
 
 static int force = -1; /* unset */
 
 static const char *const builtin_clean_usage[] = {

-       "git clean [-d] [-f] [-n] [-q] [-x | -X] [--] <paths>...",
+       "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>...",

        NULL
 };
 
        NULL
 };
 


@@ -26,6 +27,13 @@ static int git_clean_config(const char *var, const char *value, void *cb)
        return git_default_config(var, value, cb);
 }
 
        return git_default_config(var, value, cb);
 }
 

+static int exclude_cb(const struct option *opt, const char *arg, int unset)
+{
+       struct string_list *exclude_list = opt->value;
+       string_list_append(exclude_list, arg);
+       return 0;
+}
+

 int cmd_clean(int argc, const char **argv, const char *prefix)
 {
        int i;
 int cmd_clean(int argc, const char **argv, const char *prefix)
 {
        int i;


@@ -36,6 +44,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
        struct dir_struct dir;
        static const char **pathspec;
        struct strbuf buf = STRBUF_INIT;
        struct dir_struct dir;
        static const char **pathspec;
        struct strbuf buf = STRBUF_INIT;

+       struct string_list exclude_list = { NULL, 0, 0, 0 };

        const char *qname;
        char *seen = NULL;
        struct option options[] = {
        const char *qname;
        char *seen = NULL;
        struct option options[] = {


@@ -44,6 +53,8 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
                OPT_BOOLEAN('f', "force", &force, "force"),
                OPT_BOOLEAN('d', NULL, &remove_directories,
                                "remove whole directories"),
                OPT_BOOLEAN('f', "force", &force, "force"),
                OPT_BOOLEAN('d', NULL, &remove_directories,
                                "remove whole directories"),

+               { OPTION_CALLBACK, 'e', "exclude", &exclude_list, "pattern",
+                 "exclude <pattern>", PARSE_OPT_NONEG, exclude_cb },

                OPT_BOOLEAN('x', NULL, &ignored, "remove ignored files, too"),
                OPT_BOOLEAN('X', NULL, &ignored_only,
                                "remove only ignored files"),
                OPT_BOOLEAN('x', NULL, &ignored, "remove ignored files, too"),
                OPT_BOOLEAN('X', NULL, &ignored_only,
                                "remove only ignored files"),


@@ -81,6 +92,9 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
        if (!ignored)
                setup_standard_excludes(&dir);
 
        if (!ignored)
                setup_standard_excludes(&dir);
 

+       for (i = 0; i < exclude_list.nr; i++)
+               add_exclude(exclude_list.items[i].string, "", 0, dir.exclude_list);
+

        pathspec = get_pathspec(prefix, argv);
 
        fill_directory(&dir, pathspec);
        pathspec = get_pathspec(prefix, argv);
 
        fill_directory(&dir, pathspec);


@@ -167,5 +181,6 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
        free(seen);
 
        strbuf_release(&directory);
        free(seen);
 
        strbuf_release(&directory);

+       string_list_clear(&exclude_list, 0);

        return (errors != 0);
 }
        return (errors != 0);
 }