From: Ben Walton <bdwalton@gmail.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, sunshine@sunshineco.com, j6t@kdbg.org,
johannes.schindelin@gmx.de, Ben Walton <bdwalton@gmail.com>
Subject: [PATCH 2/3] Fix sed usage in tests to work around broken xpg4/sed on Solaris
Date: Sun, 19 Jul 2015 19:00:35 +0100 [thread overview]
Message-ID: <1437328836-19156-3-git-send-email-bdwalton@gmail.com> (raw)
In-Reply-To: <1437328836-19156-1-git-send-email-bdwalton@gmail.com>
The space following the last / in a sed command caused Solaris'
xpg4/sed to fail, claiming the program was garbled and exit with
status 2:
% echo 'foo' | /usr/xpg4/bin/sed -e 's/foo/bar/ '
sed: command garbled: s/foo/bar/
% echo $?
2
Fix this by simply removing the unnecessary space.
Signed-off-by: Ben Walton <bdwalton@gmail.com>
---
t/t5601-clone.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
index 8299d14..8b7f8e1 100755
--- a/t/t5601-clone.sh
+++ b/t/t5601-clone.sh
@@ -445,7 +445,7 @@ test_expect_success 'clone ssh://host.xz:22/~repo' '
#IPv6
for tuah in ::1 [::1] [::1]: user@::1 user@[::1] user@[::1]: [user@::1] [user@::1]:
do
- ehost=$(echo $tuah | sed -e "s/1]:/1]/ " | tr -d "$squarebrackets")
+ ehost=$(echo $tuah | sed -e "s/1]:/1]/" | tr -d "$squarebrackets")
test_expect_success "clone ssh://$tuah/home/user/repo" "
test_clone_url ssh://$tuah/home/user/repo $ehost /home/user/repo
"
--
2.1.4
next prev parent reply other threads:[~2015-07-19 17:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-19 18:00 Adapt some tests to work around broken Solaris tools Ben Walton
2015-07-19 18:00 ` [PATCH 1/3] Modify tr expressions so that xpg4/tr handles it on Solaris Ben Walton
2015-07-19 21:49 ` Eric Sunshine
2015-07-19 18:00 ` Ben Walton [this message]
2015-07-19 18:00 ` [PATCH 3/3] Fix sed usage in tests to work around broken xpg4/sed " Ben Walton
2015-07-19 20:22 ` Johannes Sixt
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1437328836-19156-3-git-send-email-bdwalton@gmail.com \
--to=bdwalton@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=johannes.schindelin@gmx.de \
--cc=sunshine@sunshineco.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).