mirror of
https://github.com/git/git.git
synced 2024-11-18 06:54:55 +01:00
5b2bcc7b2d
We forgot to make sure that there is no more than one pattern parameter. Also when looking for files in a directory called '--others', it passed that path limiter without preceding the end-of-options marker '--' to underlying git-ls-files, which misunderstood it as one of its options instead. $ git grep --others -e Meta/Make Meta $ git grep -o -e Meta/Make Meta $ git grep -o Meta/Make Meta look for a string "Meta/Make" from untracked files in Meta/ directory. $ git grep Meta/Make --others looks for the same string from tracked files in ./--others directory. On the other hand, $ git grep -e Meta/Make --others does not have a freestanding pattern, so everybody is parameter and there is no path specifier. It looks for the string in all the untracked files without any path limiter. [jc: updated with usability enhancements and documentation cleanups from Sean.] Signed-off-by: Junio C Hamano <junkio@cox.net>
62 lines
1,000 B
Bash
Executable file
62 lines
1,000 B
Bash
Executable file
#!/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" --
|