From 1ba0836307c463ce6de11868c85aa46c7396dae4 Mon Sep 17 00:00:00 2001 From: Steffen Prohaska Date: Sat, 23 Feb 2008 09:41:56 +0100 Subject: [PATCH] t4014: Replace sed's non-standard 'Q' by standard 'q' t4014 test used GNU extension 'Q' in its sed scripts, but the uses can safely be replaced with 'q'. Among other platforms, sed on Mac OS X 10.4 does not accept the former. Signed-off-by: Steffen Prohaska Signed-off-by: Junio C Hamano --- t/t4014-format-patch.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index a39e786f7..16aa99dc0 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -95,7 +95,7 @@ test_expect_success 'extra headers' ' git config --add format.headers "Cc: S. E. Cipient " && git format-patch --stdout master..side > patch2 && - sed -e "/^$/Q" patch2 > hdrs2 && + sed -e "/^$/q" patch2 > hdrs2 && grep "^To: R. E. Cipient $" hdrs2 && grep "^Cc: S. E. Cipient $" hdrs2 @@ -106,7 +106,7 @@ test_expect_success 'extra headers without newlines' ' git config --replace-all format.headers "To: R. E. Cipient " && git config --add format.headers "Cc: S. E. Cipient " && git format-patch --stdout master..side >patch3 && - sed -e "/^$/Q" patch3 > hdrs3 && + sed -e "/^$/q" patch3 > hdrs3 && grep "^To: R. E. Cipient $" hdrs3 && grep "^Cc: S. E. Cipient $" hdrs3 @@ -117,7 +117,7 @@ test_expect_success 'extra headers with multiple To:s' ' git config --replace-all format.headers "To: R. E. Cipient " && git config --add format.headers "To: S. E. Cipient " && git format-patch --stdout master..side > patch4 && - sed -e "/^$/Q" patch4 > hdrs4 && + sed -e "/^$/q" patch4 > hdrs4 && grep "^To: R. E. Cipient ,$" hdrs4 && grep "^ *S. E. Cipient $" hdrs4 ' @@ -125,7 +125,7 @@ test_expect_success 'extra headers with multiple To:s' ' test_expect_success 'additional command line cc' ' git config --replace-all format.headers "Cc: R. E. Cipient " && - git format-patch --cc="S. E. Cipient " --stdout master..side | sed -e "/^$/Q" >patch5 && + git format-patch --cc="S. E. Cipient " --stdout master..side | sed -e "/^$/q" >patch5 && grep "^Cc: R. E. Cipient ,$" patch5 && grep "^ *S. E. Cipient $" patch5 ' -- 2.11.0