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

[bdwalton at users.sourceforge.net]

Revision: 24695
          http://sourceforge.net/p/gar/code/24695
Author:   bdwalton
Date:     2015-03-01 11:06:55 +0000 (Sun, 01 Mar 2015)
Log Message:
-----------
git/trunk: drop a patch that is now upstream

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

Removed Paths:
-------------
    csw/mgar/pkg/git/trunk/files/0005-use-wc-w-instead-of-awk-in-test-suite.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2015-03-01 10:59:44 UTC (rev 24694)
+++ csw/mgar/pkg/git/trunk/Makefile	2015-03-01 11:06:55 UTC (rev 24695)
@@ -98,7 +98,6 @@
 PATCHFILES += 0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch
 PATCHFILES += 0003-Use-bash-and-set-PATH-in-contributed-hook-file.patch
 PATCHFILES += 0004-Add-OpenCSW-apache2-path-to-instaweb-search-path.patch
-PATCHFILES += 0005-use-wc-w-instead-of-awk-in-test-suite.patch
 
 # this patch is required on current9s (not necessarily all sparc boxes) due
 # to the selection of available utf8 locales.

Deleted: csw/mgar/pkg/git/trunk/files/0005-use-wc-w-instead-of-awk-in-test-suite.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0005-use-wc-w-instead-of-awk-in-test-suite.patch	2015-03-01 10:59:44 UTC (rev 24694)
+++ csw/mgar/pkg/git/trunk/files/0005-use-wc-w-instead-of-awk-in-test-suite.patch	2015-03-01 11:06:55 UTC (rev 24695)
@@ -1,34 +0,0 @@
-From f0b7563d0a327d23fe8e6915e3d21059a0fb0d60 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Mon, 22 Dec 2014 17:13:19 +0000
-Subject: [PATCH] use wc -w instead of awk in test suite
-
-Signed-off-by: Ben Walton <bwalton at opencsw.org>
----
- t/t0090-cache-tree.sh | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/t/t0090-cache-tree.sh b/t/t0090-cache-tree.sh
-index 158cf4f..508cce6 100755
---- a/t/t0090-cache-tree.sh
-+++ b/t/t0090-cache-tree.sh
-@@ -1,5 +1,7 @@
- #!/bin/sh
- 
-+set -x
-+
- test_description="Test whether cache-tree is properly updated
- 
- Tests whether various commands properly update and/or rewrite the
-@@ -22,7 +24,7 @@ generate_expected_cache_tree_rec () {
- 	# ls-files might have foo/bar, foo/bar/baz, and foo/bar/quux
- 	# We want to count only foo because it's the only direct child
- 	subtrees=$(git ls-files|grep /|cut -d / -f 1|uniq) &&
--	subtree_count=$(echo "$subtrees"|awk -v c=0 '$1 {++c} END {print c}') &&
-+	subtree_count=$(echo "$subtrees"| wc -w) &&
- 	entries=$(git ls-files|wc -l) &&
- 	printf "SHA $dir (%d entries, %d subtrees)\n" "$entries" "$subtree_count" &&
- 	for subtree in $subtrees
--- 
-2.1.3
-

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