X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-grep.sh;h=ad4f2fe81046505c43684e8c26f0eeaac6cc6146;hb=7d09fbe4ab7f080a8f8f5dcef7e0f3edf5e26019;hp=51924fd7c38a4fd70f59069a3eecbfe787626375;hpb=5d9d831a51dc7847ad40fac77f9a072aa2d1c0bd;p=git.git

diff --git a/git-grep.sh b/git-grep.sh
index 51924fd7..ad4f2fe8 100755
--- a/git-grep.sh
+++ b/git-grep.sh
@@ -3,18 +3,32 @@
 # 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
-	--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)
@@ -22,7 +36,7 @@ while : ; do
 		shift
 		;;
 	--)
-		# The rest are git-ls-files paths (or flags)
+		# The rest are git-ls-files paths
 		shift
 		break
 		;;
@@ -30,14 +44,19 @@ 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
 	shift
 done
-git-ls-files -z "${git_flags[@]}" "$@" |
-	xargs -0 grep "${flags[@]}" "$pattern"
+[ "$pattern" ] || {
+	usage
+}
+git-ls-files -z "${git_flags[@]}" -- "$@" |
+	xargs -0 grep "${flags[@]}" -e "$pattern" --