t4014: fix arguments to grep

gitster · gitster · commit 27f6342f615a · 2012-12-19T07:45:13.000-08:00
These "expect-failure" tests were not looking for the right string
in the patch file.  For example:

	grep "^ *"S. E. Cipient" &lt;scipient@example.com&gt;\$" patch5

was looking for "^ *S." in these three files:

    "E."
    "Cipient &lt;scipient@example.com&gt;$"
    "patch5"

With some implementations of grep, the lack of file "E." was
reported as an error, leading to the failure of the test.

With other implementations of grep, the pattern "^ *S." matched what
was in patch5, without diagnosing the missing files as an error, and
made these tests unexpectedly pass.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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 <rcipient@example.com>" &&
 	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
+	grep "^ *\"S. E. Cipient\" <scipient@example.com>\$" 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 <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch8 &&
-	grep "^To: "R. E. Cipient" <rcipient@example.com>\$" patch8
+	grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" 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 <rcipient@example.com>" &&
 	git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 &&
-	grep "^To: "R. E. Cipient" <rcipient@example.com>\$" patch9
+	grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" patch9
 '
 
 test_expect_failure 'configuration To: header (rfc2047)' '

-Original file line number
+Diff line change
 	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' '
 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)' '
 	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)' '