Skip to content

Commit

Permalink
Teach git-clean optional <paths>... parameters.
Browse files Browse the repository at this point in the history
When optional paths arguments are given, git-clean passes them
to underlying git-ls-files; with this, you can say:

	git clean 'temp-*'

to clean only the garbage files whose names begin with 'temp-'.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Pavel Roskin <proski@gnu.org>
  • Loading branch information
Junio C Hamano committed May 8, 2006
1 parent 45f75a0 commit 393e3b1
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 5 deletions.
5 changes: 4 additions & 1 deletion Documentation/git-clean.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,17 @@ git-clean - Remove untracked files from the working tree
SYNOPSIS
--------
[verse]
'git-clean' [-d] [-n] [-q] [-x | -X]
'git-clean' [-d] [-n] [-q] [-x | -X] [--] <paths>...

DESCRIPTION
-----------
Removes files unknown to git. This allows to clean the working tree
from files that are not under version control. If the '-x' option is
specified, ignored files are also removed, allowing to remove all
build products.
When optional `<paths>...` arguments are given, the paths
affected are further limited to those that match them.


OPTIONS
-------
Expand Down
17 changes: 13 additions & 4 deletions git-clean.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@
# Copyright (c) 2005-2006 Pavel Roskin
#

USAGE="[-d] [-n] [-q] [-x | -X]"
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 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

Expand Down Expand Up @@ -44,8 +46,15 @@ do
-X)
ignoredonly=1
;;
*)
--)
shift
break
;;
-*)
usage
;;
*)
break
esac
shift
done
Expand All @@ -64,7 +73,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
Expand Down

0 comments on commit 393e3b1

Please sign in to comment.