Revision: 26058
http://sourceforge.net/p/gar/code/26058
Author: rthurner
Date: 2016-12-04 14:53:35 +0000 (Sun, 04 Dec 2016)
Log Message:
-----------
git/trunk: git, update patches to new version
Modified Paths:
--------------
csw/mgar/pkg/git/trunk/files/0001-Update-path-in-documentation-to-be-CSW-proper.patch
csw/mgar/pkg/git/trunk/files/0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch
csw/mgar/pkg/git/trunk/files/0005-Modify-use-of-sed-and-tr-to-be-compatible-with-xpg4-.patch
Modified:
csw/mgar/pkg/git/trunk/files/0001-Update-path-in-documentation-to-be-CSW-proper.patch
===================================================================
---
csw/mgar/pkg/git/trunk/files/0001-Update-path-in-documentation-to-be-CSW-proper.patch
2016-12-04 12:42:19 UTC (rev 26057)
+++
csw/mgar/pkg/git/trunk/files/0001-Update-path-in-documentation-to-be-CSW-proper.patch
2016-12-04 14:53:35 UTC (rev 26058)
@@ -1,17 +1,15 @@
-From 27d53590be0ef3a170bdbe06ff904e198bf06549 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwal...@opencsw.org>
-Date: Sat, 2 May 2015 13:34:53 +0100
-Subject: [PATCH] Update path in documentation to be CSW-proper.
+From d1028067c242186191fc567855b7c653930aabc3 Mon Sep 17 00:00:00 2001
+From: THURNER rupert <rup...@opencsw.org>
+Date: Sun, 4 Dec 2016 14:50:39 +0100
+Subject: [PATCH] change documentation to point to gits default template
+ directory in /opt/csw/share instead of /usr/share
-Change /usr/share to /opt/csw/share in the git-init documentation.
-
-Signed-off-by: Ben Walton <bwal...@opencsw.org>
---
Documentation/git-init.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt
-index 8174d27..0707d56 100644
+index 9d27197..8ac7299 100644
--- a/Documentation/git-init.txt
+++ b/Documentation/git-init.txt
@@ -127,7 +127,7 @@ The template directory will be one of the following (in
order):
@@ -22,7 +20,7 @@
+ - the default template directory: `/opt/csw/share/git-core/templates`.
The default template directory includes some directory structure, suggested
- "exclude patterns" (see linkgit:gitignore[5]), and sample hook files (see
linkgit:githooks[5]).
+ "exclude patterns" (see linkgit:gitignore[5]), and sample hook files.
--
-2.3.3
+2.4.0
Modified:
csw/mgar/pkg/git/trunk/files/0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch
===================================================================
---
csw/mgar/pkg/git/trunk/files/0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch
2016-12-04 12:42:19 UTC (rev 26057)
+++
csw/mgar/pkg/git/trunk/files/0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch
2016-12-04 14:53:35 UTC (rev 26058)
@@ -1,23 +1,21 @@
-From 937605b8ae8eac2bf669af619f60eed3b3b42d23 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwal...@opencsw.org>
-Date: Sat, 27 Nov 2010 15:11:49 +0100
-Subject: [PATCH 3/3] Alter the value of _PATH_DEFPATH when paths.h not present
+From fb6813b93a65d9063ec0242060ea8b9c808e2fc6 Mon Sep 17 00:00:00 2001
+From: THURNER rupert <rup...@opencsw.org>
+Date: Sun, 4 Dec 2016 14:59:40 +0100
+Subject: [PATCH 6/6] Alter the value of _PATH_DEFPATH when paths.h not present
Since solaris doesn't provide paths.h, we won't get a system value
for _PATH_DEFPATH. This is handled by conditionally setting it, but
the value includes /usr/local/bin as the first item. We'll swap that
out for /opt/csw/bin instead.
-
-Signed-off-by: Ben Walton <bwal...@opencsw.org>
---
- git-compat-util.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ git-compat-util.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-compat-util.h b/git-compat-util.h
-index 2af8d3e..762f620 100644
+index 87237b0..accd50b 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
-@@ -184,7 +184,7 @@ extern char *gitbasename(char *);
+@@ -327,7 +327,7 @@ extern char *gitdirname(char *);
#include <paths.h>
#endif
#ifndef _PATH_DEFPATH
@@ -25,7 +23,7 @@
+#define _PATH_DEFPATH "/opt/csw/bin:/usr/bin:/bin"
#endif
- #ifndef STRIP_EXTENSION
+ #ifndef has_dos_drive_prefix
--
-1.7.3
+2.4.0
Modified:
csw/mgar/pkg/git/trunk/files/0005-Modify-use-of-sed-and-tr-to-be-compatible-with-xpg4-.patch
===================================================================
---
csw/mgar/pkg/git/trunk/files/0005-Modify-use-of-sed-and-tr-to-be-compatible-with-xpg4-.patch
2016-12-04 12:42:19 UTC (rev 26057)
+++
csw/mgar/pkg/git/trunk/files/0005-Modify-use-of-sed-and-tr-to-be-compatible-with-xpg4-.patch
2016-12-04 14:53:35 UTC (rev 26058)
@@ -1,8 +1,8 @@
-From 8bf59ec75260d585ad49dceb7bd51d632eca432a Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwal...@opencsw.org>
-Date: Mon, 4 May 2015 09:37:44 +0100
-Subject: [PATCH] Modify use of sed and tr to be compatible with xpg4 tools on
- Solaris
+From bc8e2ed873867e11dbf2ce67e1e49be2e874b1a0 Mon Sep 17 00:00:00 2001
+From: THURNER rupert <rup...@opencsw.org>
+Date: Sun, 4 Dec 2016 15:39:31 +0100
+Subject: [PATCH 8/8] Modify use of sed and tr to be compatible with xpg4 tools
+ on Solaris
The tr as found in /usr/xpg4/bin fails to strip the [ character as
used in tr -d "[]". To correct this, prefix the [ with the escape
@@ -11,18 +11,16 @@
A sed command with a trailing space isn't accepted by sed on solaris,
so remove it since it's not semantically important.
-
-Signed-off-by: Ben Walton <bwal...@opencsw.org>
---
t/t5500-fetch-pack.sh | 2 +-
t/t5601-clone.sh | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
-index 3a9b775..1df340c 100755
+index 505e1b4..7129c7f 100755
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
-@@ -547,7 +547,7 @@ check_prot_host_port_path () {
+@@ -562,7 +562,7 @@ check_prot_host_port_path () {
*ssh*)
pp=ssh
uah=userandhost
@@ -32,19 +30,19 @@
;;
*)
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
-index 1befc45..97af1fb 100755
+index a433394..0969b41 100755
--- a/t/t5601-clone.sh
+++ b/t/t5601-clone.sh
-@@ -412,7 +412,7 @@ test_expect_success 'clone ssh://host.xz:22/~repo' '
+@@ -466,7 +466,7 @@ test_expect_success 'clone ssh://host.xz:22/~repo' '
#IPv6
for tuah in ::1 [::1] [::1]: user@::1 user@[::1] user@[::1]: [user@::1]
[user@::1]:
do
-- ehost=$(echo $tuah | sed -e "s/1]:/1]/ "| tr -d "[]")
+- ehost=$(echo $tuah | sed -e "s/1]:/1]/" | tr -d "[]")
+ ehost=$(echo $tuah | sed -e "s/1]:/1]/" | tr -d "\[]")
test_expect_success "clone ssh://$tuah/home/user/repo" "
test_clone_url ssh://$tuah/home/user/repo $ehost /home/user/repo
"
-@@ -421,7 +421,7 @@ done
+@@ -475,7 +475,7 @@ done
#IPv6 from home directory
for tuah in ::1 [::1] user@::1 user@[::1] [user@::1]
do
@@ -53,7 +51,7 @@
test_expect_success "clone ssh://$tuah/~repo" "
test_clone_url ssh://$tuah/~repo $euah '~repo'
"
-@@ -430,7 +430,7 @@ done
+@@ -484,7 +484,7 @@ done
#IPv6 with port number
for tuah in [::1] user@[::1] [user@::1]
do
@@ -62,7 +60,7 @@
test_expect_success "clone ssh://$tuah:22/home/user/repo" "
test_clone_url ssh://$tuah:22/home/user/repo '-p 22' $euah
/home/user/repo
"
-@@ -439,7 +439,7 @@ done
+@@ -493,7 +493,7 @@ done
#IPv6 from home directory with port number
for tuah in [::1] user@[::1] [user@::1]
do
@@ -72,5 +70,5 @@
test_clone_url ssh://$tuah:22/~repo '-p 22' $euah '~repo'
"
--
-2.3.3
+2.4.0
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
