summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2014-06-02 16:32:36 +0000
committeradam <adam@pkgsrc.org>2014-06-02 16:32:36 +0000
commit6a69ce3dc7edb6614b8f0281cee16b9bde42b6dc (patch)
tree22919d6edb8f1e490f05d2fa6bb77886f4e27137 /devel
parent781f9f526ee29d8c6d6422991dddf3436cc560c1 (diff)
downloadpkgsrc-6a69ce3dc7edb6614b8f0281cee16b9bde42b6dc.tar.gz
Fixes since v1.9.3
------------------ * Commands that take pathspecs on the command line misbehaved when the pathspec is given as an absolute pathname (which is a practice not particularly encouraged) that points at a symbolic link in the working tree. * An earlier fix to the shell prompt script (in contrib/) for using the PROMPT_COMMAND interface did not correctly check if the extra code path needs to trigger, causing the branch name not to appear when 'promptvars' option is disabled in bash or PROMPT_SUBST is unset in zsh.
Diffstat (limited to 'devel')
-rw-r--r--devel/git-base/Makefile3
-rw-r--r--devel/git-base/distinfo8
-rw-r--r--devel/git-docs/Makefile3
-rw-r--r--devel/git/Makefile.version4
4 files changed, 8 insertions, 10 deletions
diff --git a/devel/git-base/Makefile b/devel/git-base/Makefile
index 87052d08940..b99e95c6a75 100644
--- a/devel/git-base/Makefile
+++ b/devel/git-base/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2014/05/29 23:35:35 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2014/06/02 16:32:36 adam Exp $
.include "../../devel/git/Makefile.common"
PKGNAME= git-base-${GIT_VERSION}
-PKGREVISION= 1
COMMENT= GIT Tree History Storage Tool (base package)
CONFLICTS+= scmgit-base-[0-9]*
diff --git a/devel/git-base/distinfo b/devel/git-base/distinfo
index 22850890d32..88057a44402 100644
--- a/devel/git-base/distinfo
+++ b/devel/git-base/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2014/05/10 11:43:30 adam Exp $
+$NetBSD: distinfo,v 1.14 2014/06/02 16:32:36 adam Exp $
-SHA1 (git-1.9.3.tar.xz) = c986463630e23e13b36e45d83d0e23daf9387c82
-RMD160 (git-1.9.3.tar.xz) = 8594d536e4659fee9e643d24b0f9845f3490ab2e
-Size (git-1.9.3.tar.xz) = 3386364 bytes
+SHA1 (git-1.9.4.tar.xz) = a91059d0065d82c6c2db6d69b56033a01b10eac8
+RMD160 (git-1.9.4.tar.xz) = 742b8d73fa205b34b2c2843260d94787099b6030
+Size (git-1.9.4.tar.xz) = 3387180 bytes
SHA1 (patch-aa) = 31f3759c6cf3bfd28d154b3abaa95d396b72502b
SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
diff --git a/devel/git-docs/Makefile b/devel/git-docs/Makefile
index 1033f5ec113..c78d9895c65 100644
--- a/devel/git-docs/Makefile
+++ b/devel/git-docs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2014/05/29 23:35:35 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2014/06/02 16:32:36 adam Exp $
PKGNAME= git-docs-${GIT_VERSION}
-PKGREVISION= 1
COMMENT= GIT Tree History Storage Tool (documentation)
CONFLICTS+= scmgit-docs-[0-9]*
diff --git a/devel/git/Makefile.version b/devel/git/Makefile.version
index 285783bb43e..4192c3ee9df 100644
--- a/devel/git/Makefile.version
+++ b/devel/git/Makefile.version
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.11 2014/05/10 11:43:30 adam Exp $
+# $NetBSD: Makefile.version,v 1.12 2014/06/02 16:32:36 adam Exp $
#
# used by devel/git/Makefile.common
# used by devel/git-svn/Makefile
-GIT_VERSION= 1.9.3
+GIT_VERSION= 1.9.4