SF.net SVN: gar:[22323] csw/mgar/pkg/git/trunk

[bdwalton at users.sourceforge.net]

Revision: 22323
          http://gar.svn.sourceforge.net/gar/?rev=22323&view=rev
Author:   bdwalton
Date:     2013-10-27 20:29:25 +0000 (Sun, 27 Oct 2013)
Log Message:
-----------
git/trunk: Add a patch to fix a non-portable sed usage in a test.

Modified Paths:
--------------
    csw/mgar/pkg/git/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/git/trunk/files/0008-Change-sed-invocation-to-something-Solaris-sed-can-h.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2013-10-27 18:14:13 UTC (rev 22322)
+++ csw/mgar/pkg/git/trunk/Makefile	2013-10-27 20:29:25 UTC (rev 22323)
@@ -118,6 +118,7 @@
 PATCHFILES_isa-sparcv8 += 0005-Force-en_US.UTF-8-for-a-git-svn-test.patch
 PATCHFILES += 0006-Patch-out-a-few-usr-share-references.patch
 PATCHFILES += 0007-Avoid-difference-in-tr-semantics-between-System-V-an.patch
+PATCHFILES += 0008-Change-sed-invocation-to-something-Solaris-sed-can-h.patch
 
 fdirs = $(bindir_install) $(mandir) $(libexecdir_install)
 define _git_files

Added: csw/mgar/pkg/git/trunk/files/0008-Change-sed-invocation-to-something-Solaris-sed-can-h.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0008-Change-sed-invocation-to-something-Solaris-sed-can-h.patch	                        (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0008-Change-sed-invocation-to-something-Solaris-sed-can-h.patch	2013-10-27 20:29:25 UTC (rev 22323)
@@ -0,0 +1,42 @@
+From f38f944c3e393c7a316bbe17f2d507f7bd422275 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Sun, 27 Oct 2013 17:41:19 +0100
+Subject: [PATCH] Change sed invocation to something Solaris sed can handle
+
+Solaris' sed expects a newline after the i\ command and fails
+with a 'garbled command' message if it's not there. Modify two uses
+of sed in t4015-diff-whitespace that worked in GNU sed but not in
+Solaris'.
+
+Signed-off-by: Ben Walton <bdwalton at gmail.com>
+---
+ t/t4015-diff-whitespace.sh | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
+index 3fb4b97..0126154 100755
+--- a/t/t4015-diff-whitespace.sh
++++ b/t/t4015-diff-whitespace.sh
+@@ -145,7 +145,8 @@ test_expect_success 'another test, with --ignore-space-at-eol' 'test_cmp expect
+ test_expect_success 'ignore-blank-lines: only new lines' '
+ 	test_seq 5 >x &&
+ 	git update-index x &&
+-	test_seq 5 | sed "/3/i \\
++	test_seq 5 | sed "/3/i\\
++\
+ " >x &&
+ 	git diff --ignore-blank-lines >out &&
+ 	>expect &&
+@@ -155,7 +156,8 @@ test_expect_success 'ignore-blank-lines: only new lines' '
+ test_expect_success 'ignore-blank-lines: only new lines with space' '
+ 	test_seq 5 >x &&
+ 	git update-index x &&
+-	test_seq 5 | sed "/3/i \ " >x &&
++	test_seq 5 | sed "/3/i\\
++ " >x &&
+ 	git diff -w --ignore-blank-lines >out &&
+ 	>expect &&
+ 	test_cmp out expect
+-- 
+1.8.3.4
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.