[PATCH v2] Fix git-tag test breakage caused by broken sed on Leopard
- From
Wincent Colaiuta <win@wincent.com>
- Date
- Nov 15, 2007, 15:47 UTC
- Message-ID
- <C9DFAD77-DFEF-47AC-83D5-CFDF245D95E4@wincent.com>
- In-Reply-To
- <90D416F6-A3CA-43C8-B71F-38EA955A762B@wincent.com>
The 'message in editor has initial comment' test fails on Leopard (and possibly on other versions of Mac OS X as well) due to the limited sed syntax available on that platform.
Avoid the breakage by using grep instead (suggested by Johannes Schindelin).
Signed-off-by: Wincent Colaiuta <win@wincent.com> ---
The patch I previously sent had the test sense inverted (it used 'test -z' to test for an empty string when we should have actually been looking for a non-empty string), so it really only passed by mistake. This revised version maintains the sense of the original, sed-based test.
t/t7004-tag.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh index 096fe33..b54c2e0 100755 --- a/t/t7004-tag.sh +++ b/t/t7004-tag.sh @@ -1007,7 +1007,7 @@ test_expect_failure \ test_expect_success \ 'message in editor has initial comment' ' GIT_EDITOR=cat git tag -a initial-comment > actual || true && - test $(sed -n "/^\(#\|\$\)/p" actual | wc -l) -gt 0 + test $(grep -e "^#" -e "^\$" actual | wc -l ) -gt 0 ' get_tag_header reuse $commit commit $time >expect
-- 1.5.3.5