These "expect-failure" tests were not looking for the right string
in the patch file. For example:
grep "^ *"S. E. Cipient" <[email protected]>\$" patch5
was looking for "^ *S." in three files:
"E."
"Cipient <[email protected]>$"
patch5
With some implementations of grep, the lack of file "E." was
reported as an error, leading to the expected failure of the test.
With other implementations of grep, the pattern "^ *S." matched what
was in patch5, without missing files diagnosed as an error, which
lead to these tests to unexpectedly pass.
Signed-off-by: Junio C Hamano <[email protected]>
---
t/t4014-format-patch.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 16a4ca1..90fd598 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -155,7 +155,7 @@ test_expect_failure 'additional command line cc (rfc822)' '
git config --replace-all format.headers "Cc: R E Cipient
<[email protected]>" &&
git format-patch --cc="S. E. Cipient <[email protected]>" --stdout
master..side | sed -e "/^\$/q" >patch5 &&
grep "^Cc: R E Cipient <[email protected]>,\$" patch5 &&
- grep "^ *"S. E. Cipient" <[email protected]>\$" patch5
+ grep "^ *\"S. E. Cipient\" <[email protected]>\$" patch5
'
test_expect_success 'command line headers' '
@@ -183,7 +183,7 @@ test_expect_success 'command line To: header (ascii)' '
test_expect_failure 'command line To: header (rfc822)' '
git format-patch --to="R. E. Cipient <[email protected]>" --stdout
master..side | sed -e "/^\$/q" >patch8 &&
- grep "^To: "R. E. Cipient" <[email protected]>\$" patch8
+ grep "^To: \"R. E. Cipient\" <[email protected]>\$" patch8
'
test_expect_failure 'command line To: header (rfc2047)' '
@@ -203,7 +203,7 @@ test_expect_failure 'configuration To: header (rfc822)' '
git config format.to "R. E. Cipient <[email protected]>" &&
git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 &&
- grep "^To: "R. E. Cipient" <[email protected]>\$" patch9
+ grep "^To: \"R. E. Cipient\" <[email protected]>\$" patch9
'
test_expect_failure 'configuration To: header (rfc2047)' '
--
1.8.1.rc2.196.g90926c8
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
