From 66df8cc78cdbfbe710eb040c43e45aafbd8c559d Mon Sep 17 00:00:00 2001 From: "David M. Carr" Date: Fri, 3 Aug 2012 01:24:03 -0400 Subject: [PATCH] tests: fix test-merge and test-octopus Both were failing due to extra spaces in the output from merges, which seems to have been caused by a sed expression not working as intended. According to my copy of "man re_format", basic regular expressions (such as used by sed without the -E option) don't support using + as a special character. Thus, I replaced it with one of the recommended alternatives (x+ to xx*). --- tests/test-merge | 2 +- tests/test-octopus | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test-merge b/tests/test-merge index 3f645d0ece..3e963006f0 100755 --- a/tests/test-merge +++ b/tests/test-merge @@ -48,7 +48,7 @@ git add gamma commit -m 'add gamma' # clean merge -git merge beta | sed "s/the '//;s/' strategy//" | sed 's/^Merge.*recursive.*$/Merge successful/' | sed 's/files/file/;s/insertions/insertion/;s/, 0 deletions.*//' | sed 's/| +/| /' +git merge beta | sed "s/the '//;s/' strategy//" | sed 's/^Merge.*recursive.*$/Merge successful/' | sed 's/files/file/;s/insertions/insertion/;s/, 0 deletions.*//' | sed 's/| */| /' cd .. mkdir gitrepo2 diff --git a/tests/test-octopus b/tests/test-octopus index c09b6027fb..3960385817 100755 --- a/tests/test-octopus +++ b/tests/test-octopus @@ -53,7 +53,7 @@ echo delta > delta git add delta commit -m 'add delta' -git merge branch1 branch2 | sed "s/the '//;s/' strategy//" | sed 's/^Merge.*octopus.*$/Merge successful/;s/, 0 deletions.*//' | sed 's/| +/| /' +git merge branch1 branch2 | sed "s/the '//;s/' strategy//" | sed 's/^Merge.*octopus.*$/Merge successful/;s/, 0 deletions.*//' | sed 's/| */| /' cd .. mkdir gitrepo2