[PATCH 3/6] t4012: Actually quote the sed script

[PATCH 3/6] t4012: Actually quote the sed script

[Alexander Strasser]

The nested quoting is not needed in this cases, thus the previous
version did work just fine. Never the less the usage is misleading,
so just achieve nested quoting by using double quotes instead. Lower
the probability of breakage in the future and make the code easier
to read.

NOTE: Just dropping the single quotes around the sed arguments would
      have also been possible.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
---
 t/t4012-diff-binary.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh
index 3c54269..60c2f6c 100755
--- a/t/t4012-diff-binary.sh
+++ b/t/t4012-diff-binary.sh
@@ -64,7 +64,7 @@ test_expect_success 'apply --numstat understands diff --binary format' '
 # apply needs to be able to skip the binary material correctly
 # in order to report the line number of a corrupt patch.
 test_expect_success 'apply detecting corrupt patch correctly' '
-	 git diff | sed -e 's/-CIT/xCIT/' >broken &&
+	 git diff | sed -e "s/-CIT/xCIT/" >broken &&
 	 if git apply --stat --summary broken 2>detected
 	 then
 		echo unhappy - should have detected an error
@@ -79,7 +79,7 @@ test_expect_success 'apply detecting corrupt patch correctly' '
 '
 
 test_expect_success 'apply detecting corrupt patch correctly' '
-	 git diff --binary | sed -e 's/-CIT/xCIT/' >broken &&
+	 git diff --binary | sed -e "s/-CIT/xCIT/" >broken &&
 	 if git apply --stat --summary broken 2>detected
 	 then
 		echo unhappy - should have detected an error
-- 
1.7.10.2.552.gaa3bb87

Re: [PATCH 3/6] t4012: Actually quote the sed script

[Zbigniew Jędrzejewski-Szmek]

On 07/12/2012 12:12 AM, Alexander Strasser wrote:
> The nested quoting is not needed in this cases, thus the previous
> version did work just fine. Never the less the usage is misleading,
> so just achieve nested quoting by using double quotes instead. Lower
> the probability of breakage in the future and make the code easier
> to read.

Hi,

I have some spelling corrections (minor, but since you intend to re-roll
anyway, I'll post them), and one more thing which could be corrected
(below).

3/6: s/Never the less/Nevertheless/
4/6: s/masquerading/masking/     (masquerade means to "mask oneself")

>  	 if git apply --stat --summary broken 2>detected
>  	 then
>  		echo unhappy - should have detected an error
> @@ -79,7 +79,7 @@ test_expect_success 'apply detecting corrupt patch correctly' '
>  '
>  
>  test_expect_success 'apply detecting corrupt patch correctly' '
> -	 git diff --binary | sed -e 's/-CIT/xCIT/' >broken &&
> +	 git diff --binary | sed -e "s/-CIT/xCIT/" >broken &&
>  	 if git apply --stat --summary broken 2>detected
>  	 then
>  		echo unhappy - should have detected an error
I think this can be changed to:
   test_must_fail git apply --stat --summary broken 2>detected

-
Zbyszek

Re: [PATCH 3/6] t4012: Actually quote the sed script

[Alexander Strasser]

Hi Zbigniew,

Zbigniew Jędrzejewski-Szmek wrote:
> On 07/12/2012 12:12 AM, Alexander Strasser wrote:
[...]
> I have some spelling corrections (minor, but since you intend to re-roll
> anyway, I'll post them), and one more thing which could be corrected
> (below).
> 
> 3/6: s/Never the less/Nevertheless/
> 4/6: s/masquerading/masking/     (masquerade means to "mask oneself")
[...]
> >  	 if git apply --stat --summary broken 2>detected
> >  	 then
> >  		echo unhappy - should have detected an error
> I think this can be changed to:
>    test_must_fail git apply --stat --summary broken 2>detected

  Thank you for your sharp feedback. I will implement the requested
changes for the re-roll.

  Alexander