From a97ad804f089c33069e9ff4384e06b86a0bb5dda Mon Sep 17 00:00:00 2001 From: adam Date: Sun, 11 Aug 2013 15:44:30 +0000 Subject: Changes 1.8.3.4: * The bisect log listed incorrect commits when bisection ends with only skipped ones. * The test coverage framework was left broken for some time. * The test suite for HTTP transport did not run with Apache 2.4. * "git diff" used to fail when core.safecrlf is set and the working tree contents had mixed CRLF/LF line endings. Committing such a content must be prohibited, but "git diff" should help the user to locate and fix such problems without failing. --- devel/scmgit-base/Makefile | 3 +-- devel/scmgit-base/distinfo | 8 ++++---- devel/scmgit/Makefile.version | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) (limited to 'devel') diff --git a/devel/scmgit-base/Makefile b/devel/scmgit-base/Makefile index 5e586e92bb6..3631039cb3e 100644 --- a/devel/scmgit-base/Makefile +++ b/devel/scmgit-base/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.64 2013/08/11 12:49:44 schmonz Exp $ +# $NetBSD: Makefile,v 1.65 2013/08/11 15:44:30 adam Exp $ .include "../../devel/scmgit/Makefile.common" PKGNAME= scmgit-base-${GIT_VERSION} -PKGREVISION= 1 COMMENT= GIT Tree History Storage Tool (base package) CONFLICTS+= git<4.9.5nb1 # misc/git diff --git a/devel/scmgit-base/distinfo b/devel/scmgit-base/distinfo index a4c0ffbf97d..338632dfad3 100644 --- a/devel/scmgit-base/distinfo +++ b/devel/scmgit-base/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.74 2013/07/20 11:56:27 adam Exp $ +$NetBSD: distinfo,v 1.75 2013/08/11 15:44:30 adam Exp $ -SHA1 (git-1.8.3.3.tar.gz) = 417cb12660446702bffc5c2c83cbb6e7f1e60c79 -RMD160 (git-1.8.3.3.tar.gz) = 7517b77a71f8b88a7b75cd1867b41372259810a7 -Size (git-1.8.3.3.tar.gz) = 4478249 bytes +SHA1 (git-1.8.3.4.tar.gz) = fe633d02f7d964842d7ea804278b75120fc60c11 +RMD160 (git-1.8.3.4.tar.gz) = 3781bcb5b3ff4923d48a88a5d38a563f72d58815 +Size (git-1.8.3.4.tar.gz) = 4479898 bytes SHA1 (patch-aa) = 47e743aedffe231477d82d1190787af64faaa4b4 SHA1 (patch-ac) = ae75c6ca3abb5edf688e4877f3df8b6c6297f091 SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca diff --git a/devel/scmgit/Makefile.version b/devel/scmgit/Makefile.version index d5fcbd15f4c..7bd393443e6 100644 --- a/devel/scmgit/Makefile.version +++ b/devel/scmgit/Makefile.version @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.version,v 1.59 2013/07/20 11:56:27 adam Exp $ +# $NetBSD: Makefile.version,v 1.60 2013/08/11 15:44:30 adam Exp $ # # used by devel/scmgit/Makefile.common # used by www/gitweb/Makefile -GIT_VERSION= 1.8.3.3 +GIT_VERSION= 1.8.3.4 -- cgit v1.2.3