aboutsummaryrefslogtreecommitdiff
path: root/t/t6040-tracking-info.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2008-09-30 04:03:55 -0400
committerShawn O. Pearce <spearce@spearce.org>2008-09-30 12:39:58 -0700
commit87539416fd25bfa62122ddf4f7a7b8794d5d5aa2 (patch)
tree7816077b5fe32d167749cfff8a791a457139332f /t/t6040-tracking-info.sh
parentc33912ae2463b9e486fb016ffa9d21ff8e62984a (diff)
downloadgit-87539416fd25bfa62122ddf4f7a7b8794d5d5aa2.tar.gz
git-87539416fd25bfa62122ddf4f7a7b8794d5d5aa2.tar.xz
tests: grep portability fixes
We try to avoid using the "-q" or "-e" options, as they are largely useless, as explained in aadbe44f. There is one exception for "-e" here, which is in t7701 used to produce an "or" of patterns. This can be rewritten as an egrep pattern. This patch also removes use of "grep -F" in favor of the more widely available "fgrep". [sp: Tested on AIX 5.3 by Mike Ralphson, Tested on MinGW by Johannes Sixt] Signed-off-by: Jeff King <peff@peff.net> Tested-by: Mike Ralphson <mike@abacus.co.uk> Tested-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 't/t6040-tracking-info.sh')
-rwxr-xr-xt/t6040-tracking-info.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh
index aac212e93..ba9060190 100755
--- a/t/t6040-tracking-info.sh
+++ b/t/t6040-tracking-info.sh
@@ -53,7 +53,7 @@ test_expect_success 'checkout' '
(
cd test && git checkout b1
) >actual &&
- grep -e "have 1 and 1 different" actual
+ grep "have 1 and 1 different" actual
'
test_expect_success 'status' '
@@ -63,7 +63,7 @@ test_expect_success 'status' '
# reports nothing to commit
test_must_fail git status
) >actual &&
- grep -e "have 1 and 1 different" actual
+ grep "have 1 and 1 different" actual
'