b57321f57b
git-clean did not honor core.excludesfile configuration variable, although some other commands such as git-add and git-status did. Fix this inconsistency. Original report and patch from Shun'ichi Fuji. Rewritten by me and bugs and tests are mine. Signed-off-by: Junio C Hamano <gitster@pobox.com>
107 lines
1.9 KiB
Bash
Executable File
107 lines
1.9 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# 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
|
|
When optional <paths>... arguments are given, the paths
|
|
affected are further limited to those that match them.'
|
|
SUBDIRECTORY_OK=Yes
|
|
. git-sh-setup
|
|
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 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"
|
|
echo1=":"
|
|
;;
|
|
-q)
|
|
echo1=":"
|
|
;;
|
|
-x)
|
|
ignored=1
|
|
;;
|
|
-X)
|
|
ignoredonly=1
|
|
;;
|
|
--)
|
|
shift
|
|
break
|
|
;;
|
|
-*)
|
|
usage
|
|
;;
|
|
*)
|
|
break
|
|
esac
|
|
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
|
|
|
|
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"} ${excludes_file:+"$excludes_file"} \
|
|
-- "$@" |
|
|
while read -r file; do
|
|
if [ -d "$file" -a ! -L "$file" ]; then
|
|
if [ -z "$cleandir" ]; then
|
|
$rm_refuse "$file"
|
|
continue
|
|
fi
|
|
$echo1 "Removing $file"
|
|
$rmrf "$file"
|
|
else
|
|
$echo1 "Removing $file"
|
|
$rmf "$file"
|
|
fi
|
|
done
|