aboutsummaryrefslogtreecommitdiff
path: root/git-submodule.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2008-03-12 17:32:17 -0400
committerJunio C Hamano <gitster@pobox.com>2008-03-13 00:57:52 -0700
commitaadbe44f883859536c5320e0ac1d6ed122c45671 (patch)
tree5552c7d0999106d0198ed59403b21dcc1c5111e6 /git-submodule.sh
parente85fe4d85bc7654af20ccf8054ab6922665405e5 (diff)
downloadgit-aadbe44f883859536c5320e0ac1d6ed122c45671.tar.gz
git-aadbe44f883859536c5320e0ac1d6ed122c45671.tar.xz
grep portability fix: don't use "-e" or "-q"
System V versions of grep (such as Solaris /usr/bin/grep) don't understand either of these options. git's usage of "grep -e pattern" fell into one of two categories: 1. equivalent to "grep pattern". -e is only useful here if the pattern begins with a "-", but all of the patterns are hardcoded and do not begin with a dash. 2. stripping comments and blank lines with grep -v -e "^$" -e "^#" We can fortunately do this in the affirmative as grep '^[^#]' Uses of "-q" can be replaced with redirection to /dev/null. In many tests, however, "grep -q" is used as "if this string is in the expected output, we are OK". In this case, it is fine to just remove the "-q" entirely; it simply makes the "verbose" mode of the test slightly more verbose. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-submodule.sh')
-rwxr-xr-xgit-submodule.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-submodule.sh b/git-submodule.sh
index 7171cb60a..ceb22952a 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -230,7 +230,7 @@ cmd_init()
shift
done
- git ls-files --stage -- "$@" | grep -e '^160000 ' |
+ git ls-files --stage -- "$@" | grep '^160000 ' |
while read mode sha1 stage path
do
# Skip already registered paths
@@ -284,7 +284,7 @@ cmd_update()
shift
done
- git ls-files --stage -- "$@" | grep -e '^160000 ' |
+ git ls-files --stage -- "$@" | grep '^160000 ' |
while read mode sha1 stage path
do
name=$(module_name "$path") || exit
@@ -367,7 +367,7 @@ cmd_status()
shift
done
- git ls-files --stage -- "$@" | grep -e '^160000 ' |
+ git ls-files --stage -- "$@" | grep '^160000 ' |
while read mode sha1 stage path
do
name=$(module_name "$path") || exit