diff options
Diffstat (limited to 'git-grep.sh')
| -rwxr-xr-x | git-grep.sh | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/git-grep.sh b/git-grep.sh index 2ed8e955d6..ad4f2fe810 100755 --- a/git-grep.sh +++ b/git-grep.sh @@ -3,22 +3,32 @@ # Copyright (c) Linus Torvalds, 2005 # -USAGE='<option>... <pattern> <path>...' +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 - --cached|--deleted|--others|--killed|\ - --ignored|--exclude=*|\ + -o|--cached|--deleted|--others|--killed|\ + --ignored|--modified|--exclude=*|\ --exclude-from=*|\--exclude-per-directory=*) git_flags=("${git_flags[@]}" "$1") ;; -e) - pattern="$2" + got_pattern "$2" shift ;; -A|-B|-C|-D|-d|-f|-m) @@ -26,7 +36,7 @@ while : ; do shift ;; --) - # The rest are git-ls-files paths (or flags) + # The rest are git-ls-files paths shift break ;; @@ -34,10 +44,12 @@ while : ; do flags=("${flags[@]}" "$1") ;; *) - if [ -z "$pattern" ]; then - pattern="$1" + if [ -z "$no_more_patterns" ] + then + got_pattern "$1" shift fi + [ "$1" = -- ] && shift break ;; esac @@ -46,5 +58,5 @@ done [ "$pattern" ] || { usage } -git-ls-files -z "${git_flags[@]}" "$@" | - xargs -0 grep "${flags[@]}" -e "$pattern" +git-ls-files -z "${git_flags[@]}" -- "$@" | + xargs -0 grep "${flags[@]}" -e "$pattern" -- |