@matheusbsbs / matheus-bagliano / commits / 1617adc7a0
Fork 0

Teach git clean to use setup_standard_excludes()

Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Shawn Bohrer committed Nov 14, 2007 at 23:00 UTC 1617adc7a074415413b2f48da72f43d5c6cd74c4
1 file changed +5 -12
builtin-clean.c
+5 -12
@@ -22,7 +22,7 @@ static int git_clean_config(const char *var, const char *value)
22 {
23 if (!strcmp(var, "clean.requireforce"))
24 force = !git_config_bool(var, value);
25 - return 0;
25 + return git_default_config(var, value);
26 }
27
28 int cmd_clean(int argc, const char **argv, const char *prefix)
@@ -55,10 +55,8 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
55 argc = parse_options(argc, argv, options, builtin_clean_usage, 0);
56
57 memset(&dir, 0, sizeof(dir));
58 - if (ignored_only) {
59 - dir.show_ignored =1;
60 - dir.exclude_per_dir = ".gitignore";
61 - }
58 + if (ignored_only)
59 + dir.show_ignored = 1;
60
61 if (ignored && ignored_only)
62 die("-x and -X cannot be used together");
@@ -69,13 +67,8 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
67
68 dir.show_other_directories = 1;
69
72 - if (!ignored) {
73 - dir.exclude_per_dir = ".gitignore";
74 - if (!access(git_path("info/exclude"), F_OK)) {
75 - char *exclude_path = git_path("info/exclude");
76 - add_excludes_from_file(&dir, exclude_path);
77 - }
78 - }
70 + if (!ignored)
71 + setup_standard_excludes(&dir);
72
73 pathspec = get_pathspec(prefix, argv);
74 read_cache();