[csw-devel] SF.net SVN: gar:[16628] csw/mgar/pkg/git/trunk

[bdwalton at users.sourceforge.net]

Revision: 16628
          http://gar.svn.sourceforge.net/gar/?rev=16628&view=rev
Author:   bdwalton
Date:     2011-12-31 04:23:51 +0000 (Sat, 31 Dec 2011)
Log Message:
-----------
git/trunk: disable svn tests for now; patch around sed portability issue

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

Added Paths:
-----------
    csw/mgar/pkg/git/trunk/files/0007-Use-perl-instead-of-sed-for-t8006-blame-textconv-tes.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2011-12-30 23:31:09 UTC (rev 16627)
+++ csw/mgar/pkg/git/trunk/Makefile	2011-12-31 04:23:51 UTC (rev 16628)
@@ -5,6 +5,9 @@
 
 VENDOR_URL = http://git-scm.org/
 
+NO_SVN_TESTS=YesPlease
+EXTRA_TEST_EXPORTS = NO_SVN_TESTS
+
 # disable tests until next version bump (at the top so it stands out)
 # 1.7.2.1 and 1.7.3 have a failure on current9s when fr.UFT-8 is
 # detected as the first available utf8 locale.  the failure is
@@ -107,6 +110,7 @@
 # to the selection of available utf8 locales.
 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-Use-perl-instead-of-sed-for-t8006-blame-textconv-tes.patch
 
 fdirs = $(bindir_install) $(mandir) $(libexecdir_install)
 define _git_files

Added: csw/mgar/pkg/git/trunk/files/0007-Use-perl-instead-of-sed-for-t8006-blame-textconv-tes.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0007-Use-perl-instead-of-sed-for-t8006-blame-textconv-tes.patch	                        (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0007-Use-perl-instead-of-sed-for-t8006-blame-textconv-tes.patch	2011-12-31 04:23:51 UTC (rev 16628)
@@ -0,0 +1,39 @@
+From 146a5f084306992e70bc31d93d110fa2b9192160 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Sat, 31 Dec 2011 05:02:05 +0100
+Subject: [PATCH] Use perl instead of sed for t8006-blame-textconv test
+
+In test 'blame --textconv with local changes' of t8006-blame-textconv,
+using /usr/xpg4/bin/sed (as set by SANE_TOOL_PATH), an additional newline
+was added to the output from the 'helper' script.
+
+This was noted by sed with a message such as:
+sed: Missing newline at end of file zero.bin.
+
+In turn, this was triggering a fatal error from git blame:
+fatal: unable to read files to diff
+
+To work around this difference in sed behaviour, use perl -p instead of
+sed -e as it will not insert the newline.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ t/t8006-blame-textconv.sh |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/t/t8006-blame-textconv.sh b/t/t8006-blame-textconv.sh
+index 4ee42f1..c3c22f7 100755
+--- a/t/t8006-blame-textconv.sh
++++ b/t/t8006-blame-textconv.sh
+@@ -10,7 +10,7 @@ find_blame() {
+ cat >helper <<'EOF'
+ #!/bin/sh
+ grep -q '^bin: ' "$1" || { echo "E: $1 is not \"binary\" file" 1>&2; exit 1; }
+-sed 's/^bin: /converted: /' "$1"
++perl -p -e 's/^bin: /converted: /' "$1"
+ EOF
+ chmod +x helper
+ 
+-- 
+1.7.6.1
+

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