threads / patch / 1084

patchTrivial sed fix up in t/t6001

Subject: [PATCH] Trivial sed fix up in t/t6001

## tl;dr

2 messages between Jul 1, 2005 and Jul 1, 2005. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Mark Allen· Jul 1, 2005, 13:55 UTC · lore

Change the sed seperator in t/t6001.

This trivial patch removes the semicolon as the sed seperator in the t/t6001 test script and replaces it with white space. This makes BSD sed(1) much happier.

Signed-off-by: Mark Allen <mrallen1@yahoo.com>

===

Jon,

If you could ack this patch or incorporate it into your tree, I'd be very obliged.

Thanks,

--Mark

Show changes to t/t6001-rev-list-merge-order.sh +2 −1

diff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh
--- a/t/t6001-rev-list-merge-order.sh
+++ b/t/t6001-rev-list-merge-order.sh
@@ -40,7 +40,8 @@ save_tag()
 	[ -n "$_tag" ] || error "usage: save_tag tag commit-args ..."
 	shift 1
     	"$@" >.git/refs/tags/$_tag
-    	sed_script="s/$(tag $_tag)/$_tag/g${sed_script+;}$sed_script"
+    	sed_script="s/$(tag $_tag)/$_tag/g
+$sed_script"
 }
 
 # Replace unhelpful sha1 hashses with their symbolic equivalents

Jon Seymour· Jul 1, 2005, 15:51 UTC · re: Mark Allen · lore

Re: [PATCH] Trivial sed fix up in t/t6001

On 7/1/05, Mark Allen <mrallen1@yahoo.com> wrote:

Show 16 quoted lines

> Change the sed seperator in t/t6001.
> 
> This trivial patch removes the semicolon as the sed seperator in the t/t6001 test script
> and replaces it with white space.  This makes BSD sed(1) much happier.
> 
> Signed-off-by: Mark Allen <mrallen1@yahoo.com>
> 
> ===
> 
> Jon,
> 
> If you could ack this patch or incorporate it into your tree, I'd be very obliged.
> 
> Thanks,
> 
> --Mark

Ack'd. I have also re-applied it to the code I moved into t/t6000-lib.sh in my recent patch series, so it is fit to go in one way or another!

jon.