Merge branch 'db/remote-builtin' into jk/send-pack

diff --git a/git-clean.sh b/git-clean.sh
index 299309d97169e6d9a52a8175dd0b8f6d54c5b369..521fabc20f9a7bbee222cb60c937e8c0f15b8fd6 100755 (executable)
--- a/git-clean.sh
+++ b/git-clean.sh
@@ -20,23 +20,24 @@ 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"
 
-while case "$#" in 0) break ;; esac
+disabled=$(git config --bool clean.requireForce)
+
+while test $# != 0
 do
        case "$1" in
        -d)
                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;;
@@ -83,7 +91,7 @@ if [ -z "$ignored" ]; then
        fi
 fi
 
-git-ls-files --others --directory $excl ${excl_info:+"$excl_info"} -- "$@" |
+git ls-files --others --directory $excl ${excl_info:+"$excl_info"} -- "$@" |
 while read -r file; do
        if [ -d "$file" -a ! -L "$file" ]; then
                if [ -z "$cleandir" ]; then