Re: [PATCH 2/2] Fix sed usage in tests to work around broken xpg4/sed on Solaris

2015-07-18 Thread Eric Sunshine
On Sat, Jul 18, 2015 at 11:21 AM, Ben Walton wrote: > 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 $?

Re: [PATCH 2/2] Fix sed usage in tests to work around broken xpg4/sed on Solaris

2015-07-18 Thread Johannes Sixt
Am 18.07.2015 um 17:21 schrieb Ben Walton: 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

Re: [PATCH 2/2] Fix sed usage in tests to work around broken xpg4/sed on Solaris

2015-07-19 Thread Johannes Schindelin
Hi, On 2015-07-19 08:54, Johannes Sixt wrote: > Am 18.07.2015 um 17:21 schrieb Ben Walton: >> test_expect_success "clone ssh://$tuah/home/user/repo" " >>test_clone_url ssh://$tuah/home/user/repo $ehost /home/user/repo >> " >> diff --git a/t/t9500-gitweb-standalone-no-errors.sh >

Re: [PATCH 2/2] Fix sed usage in tests to work around broken xpg4/sed on Solaris

2015-07-19 Thread Johannes Sixt
Am 19.07.2015 um 09:37 schrieb Johannes Schindelin: On 2015-07-19 08:54, Johannes Sixt wrote: Am 18.07.2015 um 17:21 schrieb Ben Walton: - sed -e s/CHANGE_ME/change_me/ file+ && - mv -f file+ file && + perl -pi -e "s/CHANGE_ME/change_me/" file && This is problematic. On Wind

Re: [PATCH 2/2] Fix sed usage in tests to work around broken xpg4/sed on Solaris

2015-07-20 Thread Junio C Hamano
Johannes Sixt writes: >> I really wonder why the previous ">file+ && mv -f file+ file" dance >> needs to be replaced? > > The sed must be replaced because some versions on Solaris choke on the > incomplete last line in the file. Switching from sed to perl is not being questioned. I think Dscho

Re: [PATCH 2/2] Fix sed usage in tests to work around broken xpg4/sed on Solaris

2015-07-22 Thread Johannes Schindelin
Hi, On 2015-07-20 18:07, Junio C Hamano wrote: > Johannes Sixt writes: > >>> I really wonder why the previous ">file+ && mv -f file+ file" dance >>> needs to be replaced? >> >> The sed must be replaced because some versions on Solaris choke on the >> incomplete last line in the file. > > Switch