From: Ben Walton <bdwalton@gmail.com>
To: tboegi@web.de, peff@peff.net, bosch@adacore.com,
brian@gernhardtsoftware.com, git@vger.kernel.org
Cc: Ben Walton <bdwalton@gmail.com>
Subject: [PATCH] Use character class for sed expression instead of \s
Date: Thu, 25 Oct 2012 16:58:19 +0100 [thread overview]
Message-ID: <1351180699-24695-1-git-send-email-bdwalton@gmail.com> (raw)
In-Reply-To: <508935CB.9020408@web.de>
Sed on Mac OS X doesn't handle \s in a sed expressions so use a more
portable character set expression instead.
Signed-off-by: Ben Walton <bdwalton@gmail.com>
---
Hi Torsten,
I think this would be a nicer fix for the issue although your solution
should work as well.
Thanks
-Ben
t/t9401-git-cvsserver-crlf.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh
index cdb8360..1c5bc84 100755
--- a/t/t9401-git-cvsserver-crlf.sh
+++ b/t/t9401-git-cvsserver-crlf.sh
@@ -46,7 +46,7 @@ check_status_options() {
echo "Error from cvs status: $1 $2" >> "${WORKDIR}/marked.log"
return 1;
fi
- got="$(sed -n -e 's/^\s*Sticky Options:\s*//p' "${WORKDIR}/status.out")"
+ got="$(sed -n -e 's/^[ ]*Sticky Options:[ ]*//p' "${WORKDIR}/status.out")"
expect="$3"
if [ x"$expect" = x"" ] ; then
expect="(none)"
--
1.7.9.5
next prev parent reply other threads:[~2012-10-25 15:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-25 3:54 t9401 fails with OS X sed Brian Gernhardt
2012-10-25 5:04 ` Geert Bosch
2012-10-25 8:41 ` Jeff King
2012-10-25 12:51 ` Torsten Bögershausen
2012-10-25 15:58 ` Ben Walton [this message]
2012-10-25 16:00 ` [PATCH] Use character class for sed expression instead of \s Brian Gernhardt
2012-10-25 16:28 ` Torsten Bögershausen
2012-10-25 18:08 ` Ben Walton
2012-10-25 20:09 ` Torsten Bögershausen
2012-10-26 12:38 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1351180699-24695-1-git-send-email-bdwalton@gmail.com \
--to=bdwalton@gmail.com \
--cc=bosch@adacore.com \
--cc=brian@gernhardtsoftware.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=tboegi@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.