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

[bdwalton at users.sourceforge.net]

Revision: 19486
          http://gar.svn.sourceforge.net/gar/?rev=19486&view=rev
Author:   bdwalton
Date:     2012-10-22 08:26:28 +0000 (Mon, 22 Oct 2012)
Log Message:
-----------
git/trunk: drop a merged patch

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

Removed 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-22 08:17:40 UTC (rev 19485)
+++ csw/mgar/pkg/git/trunk/Makefile	2012-10-22 08:26:28 UTC (rev 19486)
@@ -118,7 +118,6 @@
 # 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

Deleted: 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	2012-10-22 08:17:40 UTC (rev 19485)
+++ csw/mgar/pkg/git/trunk/files/0007-t-t5400-send-pack-Use-POSIX-options-to-cp-for-portab.patch	2012-10-22 08:26:28 UTC (rev 19486)
@@ -1,29 +0,0 @@
-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.