822f7c7349
A lot of shell scripts contained stuff starting with while case "$#" in 0) break ;; esac and similar. I consider breaking out of the condition instead of the body od the loop ugly, and the implied "true" value of the non-matching case is not really obvious to humans at first glance. It happens not to be obvious to some BSD shells, either, but that's because they are not POSIX-compliant. In most cases, this has been replaced by a straight condition using "test". "case" has the advantage of being faster than "test" on vintage shells where "test" is not a builtin. Since none of them is likely to run the git scripts, anyway, the added readability should be worth the change. A few loops have had their termination condition expressed differently. Signed-off-by: David Kastrup <dak@gnu.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
100 lines
1.7 KiB
Bash
Executable File
100 lines
1.7 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"
|
|
if [ -f "$GIT_DIR/info/exclude" ]; then
|
|
excl_info="--exclude-from=$GIT_DIR/info/exclude"
|
|
fi
|
|
if [ "$ignoredonly" ]; then
|
|
excl="$excl --ignored"
|
|
fi
|
|
fi
|
|
|
|
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
|
|
$rm_refuse "$file"
|
|
continue
|
|
fi
|
|
$echo1 "Removing $file"
|
|
$rmrf "$file"
|
|
else
|
|
$echo1 "Removing $file"
|
|
$rmf "$file"
|
|
fi
|
|
done
|