This commit should be applied on top of db/cover-letter. -- >8 -- This commit avoids sed's 'Q' operator. The Open Group's sed man page [1] does not mention 'Q'. sed on Mac OS X 10.4 does not accept Q. 'q' is sufficient for our purpose. [1] http://opengroup.org/onlinepubs/007908799/xcu/sed.html Signed-off-by: Steffen Prohaska <prohaska@xxxxxx> --- t/t4014-format-patch.sh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index a39e786..16aa99d 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 <scipient@xxxxxxxxxxx> " && git format-patch --stdout master..side > patch2 && - sed -e "/^$/Q" patch2 > hdrs2 && + sed -e "/^$/q" patch2 > hdrs2 && grep "^To: R. E. Cipient <rcipient@xxxxxxxxxxx>$" hdrs2 && grep "^Cc: S. E. Cipient <scipient@xxxxxxxxxxx>$" hdrs2 @@ -106,7 +106,7 @@ test_expect_success 'extra headers without newlines' ' git config --replace-all format.headers "To: R. E. Cipient <rcipient@xxxxxxxxxxx>" && git config --add format.headers "Cc: S. E. Cipient <scipient@xxxxxxxxxxx>" && git format-patch --stdout master..side >patch3 && - sed -e "/^$/Q" patch3 > hdrs3 && + sed -e "/^$/q" patch3 > hdrs3 && grep "^To: R. E. Cipient <rcipient@xxxxxxxxxxx>$" hdrs3 && grep "^Cc: S. E. Cipient <scipient@xxxxxxxxxxx>$" hdrs3 @@ -117,7 +117,7 @@ test_expect_success 'extra headers with multiple To:s' ' git config --replace-all format.headers "To: R. E. Cipient <rcipient@xxxxxxxxxxx>" && git config --add format.headers "To: S. E. Cipient <scipient@xxxxxxxxxxx>" && git format-patch --stdout master..side > patch4 && - sed -e "/^$/Q" patch4 > hdrs4 && + sed -e "/^$/q" patch4 > hdrs4 && grep "^To: R. E. Cipient <rcipient@xxxxxxxxxxx>,$" hdrs4 && grep "^ *S. E. Cipient <scipient@xxxxxxxxxxx>$" 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 <rcipient@xxxxxxxxxxx>" && - git format-patch --cc="S. E. Cipient <scipient@xxxxxxxxxxx>" --stdout master..side | sed -e "/^$/Q" >patch5 && + git format-patch --cc="S. E. Cipient <scipient@xxxxxxxxxxx>" --stdout master..side | sed -e "/^$/q" >patch5 && grep "^Cc: R. E. Cipient <rcipient@xxxxxxxxxxx>,$" patch5 && grep "^ *S. E. Cipient <scipient@xxxxxxxxxxx>$" patch5 ' -- 1.5.4.2.199.gb454ad - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
