Merge branch 'ph/diffopts'

diff --git a/git-clean.sh b/git-clean.sh
index 521fabc20f9a7bbee222cb60c937e8c0f15b8fd6..01c95e9fe8a19afcf331ed5ffd47eea478886213 100755 (executable)
--- a/git-clean.sh
+++ b/git-clean.sh
@@ -3,16 +3,22 @@
 # Copyright (c) 2005-2006 Pavel Roskin
 #
 
-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
-       -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
@@ -56,11 +62,9 @@ do
                shift
                break
                ;;
-       -*)
-               usage
-               ;;
        *)
-               break
+               usage # should not happen
+               ;;
        esac
        shift
 done
@@ -77,21 +81,28 @@ case "$disabled" in
        ;;
 esac
 
-case "$ignored,$ignoredonly" in
-       1,1) usage;;
-esac
+if [ "$ignored,$ignoredonly" = "1,1" ]; then
+       die "-x and -X cannot be set together"
+fi
 
 if [ -z "$ignored" ]; then
        excl="--exclude-per-directory=.gitignore"
+       excl_info= excludes_file=
        if [ -f "$GIT_DIR/info/exclude" ]; then
                excl_info="--exclude-from=$GIT_DIR/info/exclude"
        fi
+       if cfg_excl=$(git config core.excludesfile) && test -f "$cfg_excl"
+       then
+               excludes_file="--exclude-from=$cfg_excl"
+       fi
        if [ "$ignoredonly" ]; then
                excl="$excl --ignored"
        fi
 fi
 
-git ls-files --others --directory $excl ${excl_info:+"$excl_info"} -- "$@" |
+git ls-files --others --directory \
+       $excl ${excl_info:+"$excl_info"} ${excludes_file:+"$excludes_file"} \
+       -- "$@" |
 while read -r file; do
        if [ -d "$file" -a ! -L "$file" ]; then
                if [ -z "$cleandir" ]; then