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

[bdwalton at users.sourceforge.net]

Revision: 19391
          http://gar.svn.sourceforge.net/gar/?rev=19391&view=rev
Author:   bdwalton
Date:     2012-10-08 12:59:52 +0000 (Mon, 08 Oct 2012)
Log Message:
-----------
git/trunk: version bump; patch out a non-portable option in a test

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

Added Paths:
-----------
    csw/mgar/pkg/git/trunk/files/0007-t-t5400-send-pack-Use-POSIX-options-to-cp-for-portab.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2012-10-07 17:45:16 UTC (rev 19390)
+++ csw/mgar/pkg/git/trunk/Makefile	2012-10-08 12:59:52 UTC (rev 19391)
@@ -1,5 +1,5 @@
 NAME = git
-VERSION = 1.7.12
+VERSION = 1.7.12.2
 #PATCHLEVEL = rc4
 DISTNAME = $(NAME)-$(VERSION)
 CATEGORIES = devel
@@ -122,6 +122,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-t-t5400-send-pack-Use-POSIX-options-to-cp-for-portab.patch
 
 fdirs = $(bindir_install) $(mandir) $(libexecdir_install)
 define _git_files

Modified: csw/mgar/pkg/git/trunk/checksums
===================================================================
--- csw/mgar/pkg/git/trunk/checksums	2012-10-07 17:45:16 UTC (rev 19390)
+++ csw/mgar/pkg/git/trunk/checksums	2012-10-08 12:59:52 UTC (rev 19391)
@@ -1 +1 @@
-ceb1a6b17a3e33bbc70eadf8fce5876c  git-1.7.12.tar.gz
+5aa5d146825f74fee889ca5408e4e00b  git-1.7.12.2.tar.gz

Added: csw/mgar/pkg/git/trunk/files/0007-t-t5400-send-pack-Use-POSIX-options-to-cp-for-portab.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0007-t-t5400-send-pack-Use-POSIX-options-to-cp-for-portab.patch	                        (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0007-t-t5400-send-pack-Use-POSIX-options-to-cp-for-portab.patch	2012-10-08 12:59:52 UTC (rev 19391)
@@ -0,0 +1,29 @@
+From 3ed782c5e1a154271147391f93766f3e3836a30c Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Mon, 8 Oct 2012 09:28:47 +0200
+Subject: [PATCH] t/t5400-send-pack: Use POSIX options to cp for portability
+
+Avoid a GNU-ism in the cp options used by t5400-send-pack for
+portability. Use -pR instead of -a.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ t/t5400-send-pack.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
+index 250c720..65b3b0f 100755
+--- a/t/t5400-send-pack.sh
++++ b/t/t5400-send-pack.sh
+@@ -159,7 +159,7 @@ test_expect_success 'receive-pack runs auto-gc in remote repo' '
+ 	    git commit -a -m "Second commit" &&
+ 	    git repack
+ 	) &&
+-	cp -a parent child &&
++	cp -pR parent child &&
+ 	(
+ 	    # Set the child to auto-pack if more than one pack exists
+ 	    cd child &&
+-- 
+1.7.12
+

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