[csw-devel] SF.net SVN: gar:[16731] csw/mgar/pkg/git/trunk/files/ 0007-Use-perl-instead-of-sed-for-t8006-blame-textconv-tes.patch

[bdwalton at users.sourceforge.net]

Revision: 16731
          http://gar.svn.sourceforge.net/gar/?rev=16731&view=rev
Author:   bdwalton
Date:     2012-01-10 02:17:15 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
git/trunk: tweak the wording in the sed to perl test fix patch

Modified 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/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	2012-01-10 02:05:24 UTC (rev 16730)
+++ csw/mgar/pkg/git/trunk/files/0007-Use-perl-instead-of-sed-for-t8006-blame-textconv-tes.patch	2012-01-10 02:17:15 UTC (rev 16731)
@@ -1,20 +1,24 @@
-From 146a5f084306992e70bc31d93d110fa2b9192160 Mon Sep 17 00:00:00 2001
+From df9fcdc3e9f415416b86ec572f0a248264483c06 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.
+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.
 
+Sed then exits with status 2 causing the helper script to also exit
+with status 2.
+
 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.
+To work around this difference in sed behaviour, use perl -p instead
+of sed -e as it exits cleanly and does not insert the additional
+newline.
 
 Signed-off-by: Ben Walton <bwalton at opencsw.org>
 ---
@@ -35,5 +39,5 @@
  chmod +x helper
  
 -- 
-1.7.6.1
+1.7.8.2
 

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