[PATCH] Teach git clean to use setup_standard_excludes()
From: Shawn Bohrer <hidden>
Date: 2016-06-15 22:43:51
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Shawn Bohrer <redacted> --- builtin-clean.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/builtin-clean.c b/builtin-clean.c
index 01fb887..dc6a21e 100644
--- a/builtin-clean.c
+++ b/builtin-clean.c@@ -22,7 +22,7 @@ static int git_clean_config(const char *var, const char *value) { if (!strcmp(var, "clean.requireforce")) force = !git_config_bool(var, value); - return 0; + return git_default_config(var, value); } int cmd_clean(int argc, const char **argv, const char *prefix)
@@ -57,7 +57,6 @@ int cmd_clean(int argc, const char **argv, const char *prefix) memset(&dir, 0, sizeof(dir)); if (ignored_only) { dir.show_ignored =1; - dir.exclude_per_dir = ".gitignore"; } if (ignored && ignored_only)
@@ -70,11 +69,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix) dir.show_other_directories = 1; if (!ignored) { - dir.exclude_per_dir = ".gitignore"; - if (!access(git_path("info/exclude"), F_OK)) { - char *exclude_path = git_path("info/exclude"); - add_excludes_from_file(&dir, exclude_path); - } + setup_standard_excludes(&dir); } pathspec = get_pathspec(prefix, argv);
--
1.5.3.GIT