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 <prohaska@zib.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
736cc67dd7
commit
1ba0836307
@ -95,7 +95,7 @@ test_expect_success 'extra headers' '
|
||||
git config --add format.headers "Cc: S. E. Cipient <scipient@example.com>
|
||||
" &&
|
||||
git format-patch --stdout master..side > patch2 &&
|
||||
sed -e "/^$/Q" patch2 > hdrs2 &&
|
||||
sed -e "/^$/q" patch2 > hdrs2 &&
|
||||
grep "^To: R. E. Cipient <rcipient@example.com>$" hdrs2 &&
|
||||
grep "^Cc: S. E. Cipient <scipient@example.com>$" hdrs2
|
||||
|
||||
@ -106,7 +106,7 @@ test_expect_success 'extra headers without newlines' '
|
||||
git config --replace-all format.headers "To: R. E. Cipient <rcipient@example.com>" &&
|
||||
git config --add format.headers "Cc: S. E. Cipient <scipient@example.com>" &&
|
||||
git format-patch --stdout master..side >patch3 &&
|
||||
sed -e "/^$/Q" patch3 > hdrs3 &&
|
||||
sed -e "/^$/q" patch3 > hdrs3 &&
|
||||
grep "^To: R. E. Cipient <rcipient@example.com>$" hdrs3 &&
|
||||
grep "^Cc: S. E. Cipient <scipient@example.com>$" 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@example.com>" &&
|
||||
git config --add format.headers "To: S. E. Cipient <scipient@example.com>" &&
|
||||
git format-patch --stdout master..side > patch4 &&
|
||||
sed -e "/^$/Q" patch4 > hdrs4 &&
|
||||
sed -e "/^$/q" patch4 > hdrs4 &&
|
||||
grep "^To: R. E. Cipient <rcipient@example.com>,$" hdrs4 &&
|
||||
grep "^ *S. E. Cipient <scipient@example.com>$" 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@example.com>" &&
|
||||
git format-patch --cc="S. E. Cipient <scipient@example.com>" --stdout master..side | sed -e "/^$/Q" >patch5 &&
|
||||
git format-patch --cc="S. E. Cipient <scipient@example.com>" --stdout master..side | sed -e "/^$/q" >patch5 &&
|
||||
grep "^Cc: R. E. Cipient <rcipient@example.com>,$" patch5 &&
|
||||
grep "^ *S. E. Cipient <scipient@example.com>$" patch5
|
||||
'
|
||||
|
Loading…
Reference in New Issue
Block a user