Remove old "git-grep.sh" remnants
It's built-in now. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
5c87a8c560
commit
63dffdf03d
5
Makefile
5
Makefile
@ -124,7 +124,7 @@ SCRIPT_SH = \
|
||||
git-tag.sh git-verify-tag.sh \
|
||||
git-applymbox.sh git-applypatch.sh git-am.sh \
|
||||
git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
|
||||
git-merge-resolve.sh git-merge-ours.sh git-grep.sh \
|
||||
git-merge-resolve.sh git-merge-ours.sh \
|
||||
git-lost-found.sh
|
||||
|
||||
SCRIPT_PERL = \
|
||||
@ -169,7 +169,8 @@ PROGRAMS = \
|
||||
git-describe$X git-merge-tree$X git-blame$X git-imap-send$X
|
||||
|
||||
BUILT_INS = git-log$X git-whatchanged$X git-show$X \
|
||||
git-count-objects$X git-diff$X git-push$X
|
||||
git-count-objects$X git-diff$X git-push$X \
|
||||
git-grep$X
|
||||
|
||||
# what 'all' will build and 'install' will install, in gitexecdir
|
||||
ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
|
||||
|
62
git-grep.sh
62
git-grep.sh
@ -1,62 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) Linus Torvalds, 2005
|
||||
#
|
||||
|
||||
USAGE='[<option>...] [-e] <pattern> [<path>...]'
|
||||
SUBDIRECTORY_OK='Yes'
|
||||
. git-sh-setup
|
||||
|
||||
got_pattern () {
|
||||
if [ -z "$no_more_patterns" ]
|
||||
then
|
||||
pattern="$1" no_more_patterns=yes
|
||||
else
|
||||
die "git-grep: do not specify more than one pattern"
|
||||
fi
|
||||
}
|
||||
|
||||
no_more_patterns=
|
||||
pattern=
|
||||
flags=()
|
||||
git_flags=()
|
||||
while : ; do
|
||||
case "$1" in
|
||||
-o|--cached|--deleted|--others|--killed|\
|
||||
--ignored|--modified|--exclude=*|\
|
||||
--exclude-from=*|\--exclude-per-directory=*)
|
||||
git_flags=("${git_flags[@]}" "$1")
|
||||
;;
|
||||
-e)
|
||||
got_pattern "$2"
|
||||
shift
|
||||
;;
|
||||
-A|-B|-C|-D|-d|-f|-m)
|
||||
flags=("${flags[@]}" "$1" "$2")
|
||||
shift
|
||||
;;
|
||||
--)
|
||||
# The rest are git-ls-files paths
|
||||
shift
|
||||
break
|
||||
;;
|
||||
-*)
|
||||
flags=("${flags[@]}" "$1")
|
||||
;;
|
||||
*)
|
||||
if [ -z "$no_more_patterns" ]
|
||||
then
|
||||
got_pattern "$1"
|
||||
shift
|
||||
fi
|
||||
[ "$1" = -- ] && shift
|
||||
break
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
[ "$pattern" ] || {
|
||||
usage
|
||||
}
|
||||
git-ls-files -z "${git_flags[@]}" -- "$@" |
|
||||
xargs -0 grep "${flags[@]}" -e "$pattern" --
|
Loading…
Reference in New Issue
Block a user