CVS commit: pkgsrc/devel

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Mar 19 17:08:06 UTC 2020

Modified Files:
        pkgsrc/devel/git: Makefile.version
        pkgsrc/devel/git-base: Makefile distinfo

Log Message:
git: updated to 2.52.2

Git 2.25.2 Release Notes
========================

Fixes since v2.25.1
-------------------

 * Minor bugfixes to "git add -i" that has recently been rewritten in C.

 * An earlier update to show the location of working tree in the error
   message did not consider the possibility that a git command may be
   run in a bare repository, which has been corrected.

 * The "--recurse-submodules" option of various subcommands did not
   work well when run in an alternate worktree, which has been
   corrected.

 * Running "git rm" on a submodule failed unnecessarily when
   .gitmodules is only cache-dirty, which has been corrected.

 * "git rebase -i" identifies existing commits in its todo file with
   their abbreviated object name, which could become ambigous as it
   goes to create new commits, and has a mechanism to avoid ambiguity
   in the main part of its execution.  A few other cases however were
   not covered by the protection against ambiguity, which has been
   corrected.

 * The index-pack code now diagnoses a bad input packstream that
   records the same object twice when it is used as delta base; the
   code used to declare a software bug when encountering such an
   input, but it is an input error.

 * The code to automatically shrink the fan-out in the notes tree had
   an off-by-one bug, which has been killed.

 * "git check-ignore" did not work when the given path is explicitly
   marked as not ignored with a negative entry in the .gitignore file.

 * The merge-recursive machinery failed to refresh the cache entry for
   a merge result in a couple of places, resulting in an unnecessary
   merge failure, which has been fixed.

 * Fix for a bug revealed by a recent change to make the protocol v2
   the default.

 * "git merge signed-tag" while lacking the public key started to say
   "No signature", which was utterly wrong.  This regression has been
   reverted.

 * MinGW's poll() emulation has been improved.

 * "git show" and others gave an object name in raw format in its
   error output, which has been corrected to give it in hex.

 * Both "git ls-remote -h" and "git grep -h" give short usage help,
   like any other Git subcommand, but it is not unreasonable to expect
   that the former would behave the same as "git ls-remote --head"
   (there is no other sensible behaviour for the latter).  The
   documentation has been updated in an attempt to clarify this.

Also contains various documentation updates, code clean-ups and minor fixups.


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 pkgsrc/devel/git/Makefile.version
cvs rdiff -u -r1.77 -r1.78 pkgsrc/devel/git-base/Makefile
cvs rdiff -u -r1.95 -r1.96 pkgsrc/devel/git-base/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/git/Makefile.version
diff -u pkgsrc/devel/git/Makefile.version:1.84 pkgsrc/devel/git/Makefile.version:1.85
--- pkgsrc/devel/git/Makefile.version:1.84      Mon Feb 24 16:08:10 2020
+++ pkgsrc/devel/git/Makefile.version   Thu Mar 19 17:08:06 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.84 2020/02/24 16:08:10 adam Exp $
+# $NetBSD: Makefile.version,v 1.85 2020/03/19 17:08:06 adam Exp $
 #
 # used by devel/git/Makefile.common
 # used by devel/git-cvs/Makefile
 # used by devel/git-svn/Makefile
 
-GIT_VERSION=   2.25.1
+GIT_VERSION=   2.25.2

Index: pkgsrc/devel/git-base/Makefile
diff -u pkgsrc/devel/git-base/Makefile:1.77 pkgsrc/devel/git-base/Makefile:1.78
--- pkgsrc/devel/git-base/Makefile:1.77 Sun Mar  8 16:49:12 2020
+++ pkgsrc/devel/git-base/Makefile      Thu Mar 19 17:08:06 2020
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.77 2020/03/08 16:49:12 wiz Exp $
+# $NetBSD: Makefile,v 1.78 2020/03/19 17:08:06 adam Exp $
 
-PKGREVISION= 1
 .include "../../devel/git/Makefile.common"
 
 PKGNAME=       git-base-${GIT_VERSION}

Index: pkgsrc/devel/git-base/distinfo
diff -u pkgsrc/devel/git-base/distinfo:1.95 pkgsrc/devel/git-base/distinfo:1.96
--- pkgsrc/devel/git-base/distinfo:1.95 Mon Feb 24 16:08:10 2020
+++ pkgsrc/devel/git-base/distinfo      Thu Mar 19 17:08:06 2020
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.95 2020/02/24 16:08:10 adam Exp $
+$NetBSD: distinfo,v 1.96 2020/03/19 17:08:06 adam Exp $
 
-SHA1 (git-2.25.1.tar.xz) = bd69370c94de27b4b72257d1bc9bc6e45f04e70d
-RMD160 (git-2.25.1.tar.xz) = a8ab476982440c2cc94c7d21f619320d74f117d2
-SHA512 (git-2.25.1.tar.xz) = 15241143acfd8542d85d2709ac3c80dbd6e8d5234438f70c4f33cc71a2bdec3e32938df7f6351e2746d570b021d3bd0b70474ea4beec0c51d1fc45f9c287b344
-Size (git-2.25.1.tar.xz) = 5875548 bytes
+SHA1 (git-2.25.2.tar.xz) = 1ffefbd7b82d514d188d323ba700df42f14a400d
+RMD160 (git-2.25.2.tar.xz) = 03e2b8a9c041cb9b20cbe848a0babc3e602abaa8
+SHA512 (git-2.25.2.tar.xz) = 5f24bb060165a7397286588cfa32a3e77a98059058363699f7873a2efbb77419dc8985a9b8ae05166035e24db586c379b55c7049a5b6a436c554a7f621a51a23
+Size (git-2.25.2.tar.xz) = 5877576 bytes
 SHA1 (patch-Documentation_Makefile) = 06460f220b4703a1ff98809006ec1aed5017bb23
 SHA1 (patch-Makefile) = 73741b9d9a1b32bb47db48a7c546c4ff10fb41d6
 SHA1 (patch-builtin_receive-pack.c) = 271df08d874a11b41f33aade64352040bc028fa2