threads / patch / 27259

patcht/annotate-tests: Use echo & cat instead of sed

Subject: [PATCH] t/annotate-tests: Use echo & cat instead of sed

## tl;dr

3 messages between May 5, 2011 and May 5, 2011. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Brian Gernhardt· May 5, 2011, 04:43 UTC · lore

The use of the sed command "1i No robots allowed" caused the version of sed in OS X to die with

   sed: 1: "1i "No robots allowed"\n": command i expects \ followed by
   text

Since this command was just trying to add a single line to the beginning of the file, do the same with "echo > file.net && cat file

>> file.new"
Unbreaks t8001 and t8002 on OS X 10.6.7
---
 t/annotate-tests.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
Show changes to t/annotate-tests.sh +2 −1
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index abb1885..c56a77d 100644
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -127,7 +127,8 @@ test_expect_success \
 
 test_expect_success \
     'an obfuscated email added' \
-    'sed -e "1i No robots allowed" < file > file.new &&
+    'echo "No robots allowed" > file.new &&
+     cat file >> file.new &&
      mv file.new file &&
      GIT_AUTHOR_NAME="E" GIT_AUTHOR_EMAIL="E at test dot git" git commit -a -m "norobots"'
 

-- 
1.7.5.258.g6ba2f
Junio C Hamano· May 5, 2011, 05:39 UTC · re: Brian Gernhardt · lore

Re: [PATCH] t/annotate-tests: Use echo & cat instead of sed

An earlier patch from Arjen Laarhoven
  From: Arjen Laarhoven <arjen@yaph.org>
  Subject: [PATCH] annotate.sh: Fix failing test on OS X
  Date: Wed,  4 May 2011 15:36:21 +0200
  Message-ID: <1304516181-92364-1-git-send-email-arjen@yaph.org>

seems to attempt to address the same issue but with a twist to deal with an incomplete line at the end of file.

Arjen, does Brian's patch look good to you, too? It is much less tricky and should look obviously correct even to people who sees the code in question for the first time.

Thanks, both.
Arjen Laarhoven· May 5, 2011, 07:43 UTC · re: Junio C Hamano · lore

Re: [PATCH] t/annotate-tests: Use echo & cat instead of sed

On Wed, May 04, 2011 at 10:39:55PM -0700, Junio C Hamano wrote:
Show 13 quoted lines
> An earlier patch from Arjen Laarhoven
> 
>   From: Arjen Laarhoven <arjen@yaph.org>
>   Subject: [PATCH] annotate.sh: Fix failing test on OS X
>   Date: Wed,  4 May 2011 15:36:21 +0200
>   Message-ID: <1304516181-92364-1-git-send-email-arjen@yaph.org>
> 
> seems to attempt to address the same issue but with a twist to deal with
> an incomplete line at the end of file.
> 
> Arjen, does Brian's patch look good to you, too?  It is much less tricky
> and should look obviously correct even to people who sees the code in
> question for the first time.

Yup, this looks much better than my fix. At least I learned something about the sed incompatibilities ;-)

Arjen
-- 
Arjen Laarhoven

The presence of those seeking the truth is infinitely to be preferred to 
those who think they've found it.
                                -- Terry Pratchett, "Monstrous Regiment"

← back to recent threads