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

git-clean: Fix error message if clean.requireForce is not set.

Browse Source 
It was distracting to see this error message:

     clean.requireForce set and -n or -f not given; refusing to clean

even though clean.requireForce was not set at all. This patch distinguishes
the cases and gives a different message depending on whether the
configuration variable is not set or set to true.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2007-11-12 21:13:05 -08:00
parent 113f10f22f
commit 625db1b753
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builtin-clean.c
View File

@ -11,7 +11,7 @@
#include "dir.h" #include "dir.h"
#include "parse-options.h" #include "parse-options.h"
static int force; static int force = -1; /* unset */
static const char *const builtin_clean_usage[] = { static const char *const builtin_clean_usage[] = {
"git-clean [-d] [-f] [-n] [-q] [-x | -X] [--] <paths>...", "git-clean [-d] [-f] [-n] [-q] [-x | -X] [--] <paths>...",
@ -29,7 +29,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
{ {
int j; int j;
int show_only = 0, remove_directories = 0, quiet = 0, ignored = 0; int show_only = 0, remove_directories = 0, quiet = 0, ignored = 0;
int ignored_only = 0, baselen = 0; int ignored_only = 0, baselen = 0, config_set = 0;
struct strbuf directory; struct strbuf directory;
struct dir_struct dir; struct dir_struct dir;
const char *path, *base; const char *path, *base;
@ -47,6 +47,11 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
}; };
git_config(git_clean_config); git_config(git_clean_config);
if (force < 0)
force = 0;
else
config_set = 1;
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));
@ -59,7 +64,8 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
die("-x and -X cannot be used together"); die("-x and -X cannot be used together");
if (!show_only && !force) if (!show_only && !force)
die("clean.requireForce set and -n or -f not given; refusing to clean"); die("clean.requireForce%s set and -n or -f not given; "
"refusing to clean", config_set ? "" : " not");
dir.show_other_directories = 1; dir.show_other_directories = 1;