undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Teach git clean to use setup_standard_excludes()

Browse Source 
Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Shawn Bohrer 2007-11-14 23:00:54 -06:00 committed by Junio C Hamano
parent 625db1b753
commit 1617adc7a0
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
builtin-clean.c
View File

@ -22,7 +22,7 @@ static int git_clean_config(const char *var, const char *value)
{ {
if (!strcmp(var, "clean.requireforce")) if (!strcmp(var, "clean.requireforce"))
force = !git_config_bool(var, value); 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) 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)
argc = parse_options(argc, argv, options, builtin_clean_usage, 0); argc = parse_options(argc, argv, options, builtin_clean_usage, 0);
memset(&dir, 0, sizeof(dir)); memset(&dir, 0, sizeof(dir));
if (ignored_only) { if (ignored_only)
dir.show_ignored =1; dir.show_ignored = 1;
dir.exclude_per_dir = ".gitignore";
}
if (ignored && ignored_only) if (ignored && ignored_only)
die("-x and -X cannot be used together"); die("-x and -X cannot be used together");
@ -69,13 +67,8 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
dir.show_other_directories = 1; dir.show_other_directories = 1;
if (!ignored) { if (!ignored)
dir.exclude_per_dir = ".gitignore"; setup_standard_excludes(&dir);
if (!access(git_path("info/exclude"), F_OK)) {
char *exclude_path = git_path("info/exclude");
add_excludes_from_file(&dir, exclude_path);
}
}
pathspec = get_pathspec(prefix, argv); pathspec = get_pathspec(prefix, argv);
read_cache(); read_cache();