threads / patch / 31000

patch, 6 partst4012: Actually quote the sed script

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

## tl;dr

3 messages between Jul 11, 2012 and Jul 12, 2012. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Alexander Strasser· Jul 11, 2012, 22:12 UTC · lore

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(-)

Show changes to t/t4012-diff-binary.sh +2 −2

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

Zbigniew Jędrzejewski-Szmek· Jul 12, 2012, 12:15 UTC · re: Alexander Strasser · lore

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

On 07/12/2012 12:12 AM, Alexander Strasser wrote:

Show 5 quoted lines

> 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")

Show 12 quoted lines

>  	 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

Alexander Strasser· Jul 12, 2012, 22:26 UTC · re: Zbigniew Jędrzejewski-Szmek · lore

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

Hi Zbigniew,

Zbigniew Jędrzejewski-Szmek wrote:

> On 07/12/2012 12:12 AM, Alexander Strasser wrote:

[...]

Show 6 quoted lines

> 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")

[...]

Show 5 quoted lines

> >  	 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