aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Triplett <josh@freedesktop.org>2007-04-23 17:18:16 -0700
committerJunio C Hamano <junkio@cox.net>2007-04-23 22:13:50 -0700
commit2122591b3b5c6d93d3052a3151afcfa3146ede84 (patch)
tree59d0c98999b5021f2e9816d01fdc0d4efbdd079c
parentab69e89c7e95f309564c3967222bd39f0587a74c (diff)
downloadgit-2122591b3b5c6d93d3052a3151afcfa3146ede84.tar.gz
git-2122591b3b5c6d93d3052a3151afcfa3146ede84.tar.xz
Add clean.requireForce option, and add -f option to git-clean to override it
Add a new configuration option clean.requireForce. If set, git-clean will refuse to run, unless forced with the new -f option, or not acting due to -n. Signed-off-by: Josh Triplett <josh@freedesktop.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Documentation/config.txt4
-rw-r--r--Documentation/git-clean.txt6
-rwxr-xr-xcontrib/completion/git-completion.bash1
-rwxr-xr-xgit-clean.sh13
4 files changed, 22 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index b13ff3a1b..e0aff5369 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -300,6 +300,10 @@ branch.<name>.merge::
branch.<name>.merge to the desired branch, and use the special setting
`.` (a period) for branch.<name>.remote.
+clean.requireForce::
+ A boolean to make git-clean do nothing unless given -f or -n. Defaults
+ to false.
+
color.branch::
A boolean to enable/disable color in the output of
gitlink:git-branch[1]. May be set to `true` (or `always`),
diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt
index c61afbcdb..5aff026eb 100644
--- 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]
-'git-clean' [-d] [-n] [-q] [-x | -X] [--] <paths>...
+'git-clean' [-d] [-f] [-n] [-q] [-x | -X] [--] <paths>...
DESCRIPTION
-----------
@@ -25,6 +25,10 @@ OPTIONS
-d::
Remove untracked directories in addition to untracked files.
+-f::
+ If the git configuration specifies clean.forceRequire as true,
+ git-clean will refuse to run unless given -f or -n.
+
-n::
Don't actually remove anything, just show what would be done.
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 7c0340348..46356e8a2 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -790,6 +790,7 @@ _git_config ()
core.legacyHeaders
core.packedGitWindowSize
core.packedGitLimit
+ clean.requireForce
color.branch
color.branch.current
color.branch.local
diff --git a/git-clean.sh b/git-clean.sh
index db177a788..299309d97 100755
--- a/git-clean.sh
+++ b/git-clean.sh
@@ -3,9 +3,10 @@
# Copyright (c) 2005-2006 Pavel Roskin
#
-USAGE="[-d] [-n] [-q] [-x | -X] [--] <paths>..."
+USAGE="[-d] [-f] [-n] [-q] [-x | -X] [--] <paths>..."
LONG_USAGE='Clean untracked files from the working directory
-d remove directories as well
+ -f override clean.requireForce and clean anyway
-n don'\''t remove anything, just show what would be done
-q be quiet, only report errors
-x remove ignored files as well
@@ -19,6 +20,7 @@ require_work_tree
ignored=
ignoredonly=
cleandir=
+disabled="`git-config --bool clean.requireForce`"
rmf="rm -f --"
rmrf="rm -rf --"
rm_refuse="echo Not removing"
@@ -30,7 +32,11 @@ do
-d)
cleandir=1
;;
+ -f)
+ disabled=
+ ;;
-n)
+ disabled=
rmf="echo Would remove"
rmrf="echo Would remove"
rm_refuse="echo Would not remove"
@@ -58,6 +64,11 @@ do
shift
done
+if [ "$disabled" = true ]; then
+ echo "clean.requireForce set and -n or -f not given; refusing to clean"
+ exit 1
+fi
+
case "$ignored,$ignoredonly" in
1,1) usage;;
esac