git-quiltimport.sh fix --patches handling
[gitweb.git] / git-clean.sh
index db177a7886b6407b4c4ad7b778a1ae99471355ac..35a5142c56f8d6f9007fcde840bf0d90b1d02a3a 100755 (executable)
@@ -3,15 +3,22 @@
 # Copyright (c) 2005-2006 Pavel Roskin
 #
 
-USAGE="[-d] [-n] [-q] [-x | -X] [--] <paths>..."
-LONG_USAGE='Clean untracked files from the working directory
-       -d      remove directories as well
-       -n      don'\''t remove anything, just show what would be done
-       -q      be quiet, only report errors
-       -x      remove ignored files as well
-       -X      remove only ignored files
+OPTIONS_KEEPDASHDASH=
+OPTIONS_SPEC="\
+git-clean [options] <paths>...
+
+Clean untracked files from the working directory
+
 When optional <paths>... arguments are given, the paths
-affected are further limited to those that match them.'
+affected are further limited to those that match them.
+--
+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
+X remove only ignored files"
+
 SUBDIRECTORY_OK=Yes
 . git-sh-setup
 require_work_tree
@@ -19,18 +26,23 @@ 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
+while test $# != 0
 do
        case "$1" in
        -d)
                cleandir=1
                ;;
+       -f)
+               disabled=
+               ;;
        -n)
+               disabled=
                rmf="echo Would remove"
                rmrf="echo Would remove"
                rm_refuse="echo Would not remove"
@@ -49,18 +61,20 @@ do
                shift
                break
                ;;
-       -*)
-               usage
-               ;;
        *)
-               break
+               usage # should not happen
+               ;;
        esac
        shift
 done
 
-case "$ignored,$ignoredonly" in
-       1,1) usage;;
-esac
+if [ "$disabled" = true ]; then
+       die "clean.requireForce set and -n or -f not given; refusing to clean"
+fi
+
+if [ "$ignored,$ignoredonly" = "1,1" ]; then
+       die "-x and -X cannot be set together"
+fi
 
 if [ -z "$ignored" ]; then
        excl="--exclude-per-directory=.gitignore"
@@ -72,7 +86,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