diff options
| author | Jeff King <peff@peff.net> | 2008-09-30 04:03:55 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-09-30 12:39:58 -0700 |
| commit | 87539416fd25bfa62122ddf4f7a7b8794d5d5aa2 (patch) | |
| tree | 7816077b5fe32d167749cfff8a791a457139332f /t/t4150-am.sh | |
| parent | c33912ae2463b9e486fb016ffa9d21ff8e62984a (diff) | |
| download | git-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/t4150-am.sh')
| -rwxr-xr-x | t/t4150-am.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4150-am.sh b/t/t4150-am.sh index 1be5fb3f9..796f79526 100755 --- a/t/t4150-am.sh +++ b/t/t4150-am.sh @@ -165,7 +165,7 @@ test_expect_success 'am --keep really keeps the subject' ' git am --keep patch4 && ! test -d .git/rebase-apply && git cat-file commit HEAD | - grep -q -F "Re: Re: Re: [PATCH 1/5 v2] third" + fgrep "Re: Re: Re: [PATCH 1/5 v2] third" ' test_expect_success 'am -3 falls back to 3-way merge' ' |