Merge branch 'maint'

[git.git] / git-clean.sh

diff --git a/git-clean.sh b/git-clean.sh
index 931d1aa4e4ed6cefb52c2dfe31aa5f059d0b2129..ad68595fbf313c1cab7de565e6d44f2c87aff384 100755 (executable)
--- a/git-clean.sh
+++ b/git-clean.sh
@@ -20,12 +20,13 @@ require_work_tree
 ignored=
 ignoredonly=
 cleandir=
-disabled="`git config --bool clean.requireForce`"
 rmf="rm -f --"
 rmrf="rm -rf --"
 rm_refuse="echo Not removing"
 echo1="echo"
 
+disabled=$(git config --bool clean.requireForce)
+
 while test $# != 0
 do
        case "$1" in
@@ -33,10 +34,10 @@ do
                cleandir=1
                ;;
        -f)
-               disabled=
+               disabled=false
                ;;
        -n)
-               disabled=
+               disabled=false
                rmf="echo Would remove"
                rmrf="echo Would remove"
                rm_refuse="echo Would not remove"
@@ -64,10 +65,17 @@ do
        shift
 done
 
-if [ "$disabled" = true ]; then
-       echo "clean.requireForce set and -n or -f not given; refusing to clean"
-       exit 1
-fi
+# requireForce used to default to false but now it defaults to true.
+# IOW, lack of explicit "clean.requireForce = false" is taken as
+# "clean.requireForce = true".
+case "$disabled" in
+"")
+       die "clean.requireForce not set and -n or -f not given; refusing to clean"
+       ;;
+"true")
+       die "clean.requireForce set and -n or -f not given; refusing to clean"
+       ;;
+esac
 
 case "$ignored,$ignoredonly" in
        1,1) usage;;