Re: [PATCH] Use character class for sed expression instead of \s
On Thu, Oct 25, 2012 at 04:58:19PM +0100, Ben Walton wrote: 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 bdwal...@gmail.com Thanks, I think this simple solution is the best. -Peff -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] Use character class for sed expression instead of \s
On 25.10.12 18:00, Brian Gernhardt wrote: On Oct 25, 2012, at 11:58 AM, Ben Walton bdwal...@gmail.com wrote: 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 bdwal...@gmail.com Acked-by: Brian Gernhardt br...@gernhardtsoftware.com I have an identical change sitting in my git.git, I've just been too distracted by other things to commit and send it. ~~ Brian Gernhardt Much nicer, indeed. BTW: While we are talking CVS: (I installed a fresh version) cvs --version Concurrent Versions System (CVS) 1.11.23 (client/server) And t9200 fails: git checkout t9200-git-cvsexportcommit.sh tb@birne:~/projects/git/git.pu/t ./t9200-git-cvsexportcommit.sh cvs [init aborted]: Cannot initialize repository under existing CVSROOT: `/Users/tb/projects/git/git.pu/t/trash directory.t9200-git-cvsexportcommit' FATAL: Unexpected exit with code 1 The following fixes it, but there are possibly better solutions. Any comments/suggestions ? diff t9200-git-cvsexportcommit.sh t9200-git-cvsexportcommit.tb.sh 28,29c28 mkdir $CVSROOT cvs init --- (cvs init || mkdir $CVSROOT cvs init ) -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] Use character class for sed expression instead of \s
Hi Torsten, On Thu, Oct 25, 2012 at 5:28 PM, Torsten Bögershausen tbo...@web.de wrote: BTW: While we are talking CVS: (I installed a fresh version) cvs --version Concurrent Versions System (CVS) 1.11.23 (client/server) I have 1.12.13-MirDebian-8 here. And t9200 fails: git checkout t9200-git-cvsexportcommit.sh tb@birne:~/projects/git/git.pu/t ./t9200-git-cvsexportcommit.sh cvs [init aborted]: Cannot initialize repository under existing CVSROOT: `/Users/tb/projects/git/git.pu/t/trash directory.t9200-git-cvsexportcommit' FATAL: Unexpected exit with code 1 I'm not able to reproduce this manually...are you able to make it fail this way outside of the test harness? $ CVSROOT=$PWD/bw $ export CVSROOT $ mkdir $CVSROOT cvs init echo ok ok $ rm -rf $CVSROOT $ cvs init echo ok ok (cvs init || mkdir $CVSROOT cvs init ) If your version of cvs fails the checks above in manual testing, we could see if there is a flag that works in all (old and new) versions to override the failure if CVSROOT exists. Otherwise, this isn't a bad fix, I don't think. If your version does fail the manual checks, I think it's likely a regression that was introduced and later reverted. I don't see those strings inside my cvs binary at all...? HTH. Thanks -Ben -- --- Take the risk of thinking for yourself. Much more happiness, truth, beauty and wisdom will come to you that way. -Christopher Hitchens --- -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
