summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2011-06-02 09:08:17 +0000
committeradam <adam@pkgsrc.org>2011-06-02 09:08:17 +0000
commitb60fe3c88077b339fa5e390c2e1a4342c14491f2 (patch)
treedb83d4fc0d0af3c149acbe9897cdb048a6a925e9 /devel
parenta01b351d635d61e32fe83ed67cff3212bb435558 (diff)
downloadpkgsrc-b60fe3c88077b339fa5e390c2e1a4342c14491f2.tar.gz
Changes 1.7.5.4:
* The single-key mode of "git add -p" was easily fooled into thinking that it was told to add everthing ('a') when up-arrow was pressed by mistake. * Setting a git command that uses custom configuration via "-c var=val" as an alias caused a crash due to a realloc(3) failure. * "git diff -C -C" used to disable the rename detection entirely when there are too many copy candidate paths in the tree; now it falls back to "-C" when doing so would keep the copy candidate paths under the rename detection limit. * "git rerere" did not diagnose a corrupt MERGE_RR file in some cases.
Diffstat (limited to 'devel')
-rw-r--r--devel/scmgit-base/distinfo8
-rw-r--r--devel/scmgit/Makefile.version4
2 files changed, 6 insertions, 6 deletions
diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo
index 4cc5e8b49fa..aa3ff814f35 100644
--- a/devel/scmgit-base/distinfo
+++ b/devel/scmgit-base/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.38 2011/05/28 08:03:30 tnn Exp $
+$NetBSD: distinfo,v 1.39 2011/06/02 09:08:18 adam Exp $
-SHA1 (git-1.7.5.2.tar.bz2) = c7cc4f9b0a8718e966d32c8f834df67ed2b5560f
-RMD160 (git-1.7.5.2.tar.bz2) = c1e4e065b0fe7e756d22ac0a3c867ebd4923bb4c
-Size (git-1.7.5.2.tar.bz2) = 2766306 bytes
+SHA1 (git-1.7.5.4.tar.bz2) = 076eca037a993de2c1bcf093fee5a1ad56af71fa
+RMD160 (git-1.7.5.4.tar.bz2) = 2cde34bb24ed5ecb1e07b2b5e8314adfd781a186
+Size (git-1.7.5.4.tar.bz2) = 2768851 bytes
SHA1 (patch-aa) = f47ff9d8b9ba8592f7bbd21d4b0ab30394e8f9a0
SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091
SHA1 (patch-ae) = 06ea26658a986dc702c1c2c04c1a27f0a01e4dce
diff --git a/devel/scmgit/Makefile.version b/devel/scmgit/Makefile.version
index 6a1f01a62ee..b77bad320a1 100644
--- a/devel/scmgit/Makefile.version
+++ b/devel/scmgit/Makefile.version
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.24 2011/05/21 17:25:13 adam Exp $
+# $NetBSD: Makefile.version,v 1.25 2011/06/02 09:08:17 adam Exp $
-GIT_VERSION= 1.7.5.2
+GIT_VERSION= 1.7.5.4