Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 8FCA77A1F9 for ; Sat, 25 Feb 2017 08:32:59 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 3A6EE85615; Sat, 25 Feb 2017 08:32:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id BDFD7855E2 for ; Sat, 25 Feb 2017 08:32:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 1UYXuftRPkxX for ; Sat, 25 Feb 2017 08:32:57 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id C252C855AA for ; Sat, 25 Feb 2017 08:32:57 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id BC2CDFBE4; Sat, 25 Feb 2017 08:32:57 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1488011577213280" MIME-Version: 1.0 Date: Sat, 25 Feb 2017 08:32:57 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/devel To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20170225083257.BC2CDFBE4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1488011577213280 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Sat Feb 25 08:32:57 UTC 2017 Modified Files: pkgsrc/devel/git: Makefile.version pkgsrc/devel/git-base: PLIST distinfo pkgsrc/devel/git-base/patches: patch-ac pkgsrc/devel/git-docs: PLIST pkgsrc/devel/git-gitk: PLIST Log Message: Git 2.12 Release Notes ====================== Backward compatibility notes. * Use of an empty string that is used for 'everything matches' is still warned and Git asks users to use a more explicit '.' for that instead. The hope is that existing users will not mind this change, and eventually the warning can be turned into a hard error, upgrading the deprecation into removal of this (mis)feature. That is not scheduled to happen in the upcoming release (yet). * The historical argument order "git merge HEAD ..." has been deprecated for quite some time, and will be removed in a future release. * An ancient script "git relink" has been removed. Updates since v2.11 ------------------- UI, Workflows & Features * Various updates to "git p4". * "git p4" didn't interact with the internal of .git directory correctly in the modern "git-worktree"-enabled world. * "git branch --list" and friends learned "--ignore-case" option to optionally sort branches and tags case insensitively. * In addition to %(subject), %(body), "log --pretty=format:..." learned a new placeholder %(trailers). * "git rebase" learned "--quit" option, which allows a user to remove the metadata left by an earlier "git rebase" that was manually aborted without using "git rebase --abort". * "git clone --reference $there --recurse-submodules $super" has been taught to guess repositories usable as references for submodules of $super that are embedded in $there while making a clone of the superproject borrow objects from $there; extend the mechanism to also allow submodules of these submodules to borrow repositories embedded in these clones of the submodules embedded in the clone of the superproject. * Porcelain scripts written in Perl are getting internationalized. * "git merge --continue" has been added as a synonym to "git commit" to conclude a merge that has stopped due to conflicts. * Finer-grained control of what protocols are allowed for transports during clone/fetch/push have been enabled via a new configuration mechanism. * "git shortlog" learned "--committer" option to group commits by committer, instead of author. * GitLFS integration with "git p4" has been updated. * The isatty() emulation for Windows has been updated to eradicate the previous hack that depended on internals of (older) MSVC runtime. * Some platforms no longer understand "latin-1" that is still seen in the wild in e-mail headers; replace them with "iso-8859-1" that is more widely known when conversion fails from/to it. * "git grep" has been taught to optionally recurse into submodules. * "git rm" used to refuse to remove a submodule when it has its own git repository embedded in its working tree. It learned to move the repository away to $GIT_DIR/modules/ of the superproject instead, and allow the submodule to be deleted (as long as there will be no loss of local modifications, that is). * A recent updates to "git p4" was not usable for older p4 but it could be made to work with minimum changes. Do so. * "git diff" learned diff.interHunkContext configuration variable that gives the default value for its --inter-hunk-context option. * The prereleaseSuffix feature of version comparison that is used in "git tag -l" did not correctly when two or more prereleases for the same release were present (e.g. when 2.0, 2.0-beta1, and 2.0-beta2 are there and the code needs to compare 2.0-beta1 and 2.0-beta2). * "git submodule push" learned "--recurse-submodules=only option to push submodules out without pushing the top-level superproject. * "git tag" and "git verify-tag" learned to put GPG verification status in their "--format=" output format. * An ancient repository conversion tool left in contrib/ has been removed. * "git show-ref HEAD" used with "--verify" because the user is not interested in seeing refs/remotes/origin/HEAD, and used with "--head" because the user does not want HEAD to be filtered out, i.e. "git show-ref --head --verify HEAD", did not work as expected. * "git submodule add" used to be confused and refused to add a locally created repository; users can now use "--force" option to add them. (merge 619acfc78c sb/submodule-add-force later to maint). * Some people feel the default set of colors used by "git log --graph" rather limiting. A mechanism to customize the set of colors has been introduced. * "git read-tree" and its underlying unpack_trees() machinery learned to report problematic paths prefixed with the --super-prefix option. * When a submodule "A", which has another submodule "B" nested within it, is "absorbed" into the top-level superproject, the inner submodule "B" used to be left in a strange state. The logic to adjust the .git pointers in these submodules has been corrected. * The user can specify a custom update method that is run when "submodule update" updates an already checked out submodule. This was ignored when checking the submodule out for the first time and we instead always just checked out the commit that is bound to the path in the superproject's index. * The command line completion (in contrib/) learned that "git diff --submodule=" can take "diff" as a recently added option. * The "core.logAllRefUpdates" that used to be boolean has been enhanced to take 'always' as well, to record ref updates to refs other than the ones that are expected to be updated (i.e. branches, remote-tracking branches and notes). * Comes with more command line completion (in contrib/) for recently introduced options. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 pkgsrc/devel/git/Makefile.version cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/git-base/PLIST cvs rdiff -u -r1.58 -r1.59 pkgsrc/devel/git-base/distinfo cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/git-base/patches/patch-ac cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/git-docs/PLIST cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/git-gitk/PLIST Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1488011577213280 Content-Disposition: inline Content-Length: 4967 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/git/Makefile.version diff -u pkgsrc/devel/git/Makefile.version:1.52 pkgsrc/devel/git/Makefile.version:1.53 --- pkgsrc/devel/git/Makefile.version:1.52 Sat Feb 4 11:14:47 2017 +++ pkgsrc/devel/git/Makefile.version Sat Feb 25 08:32:57 2017 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.version,v 1.52 2017/02/04 11:14:47 adam Exp $ +# $NetBSD: Makefile.version,v 1.53 2017/02/25 08:32:57 adam Exp $ # # used by devel/git/Makefile.common # used by devel/git-cvs/Makefile # used by devel/git-svn/Makefile -GIT_VERSION= 2.11.1 +GIT_VERSION= 2.12.0 Index: pkgsrc/devel/git-base/PLIST diff -u pkgsrc/devel/git-base/PLIST:1.14 pkgsrc/devel/git-base/PLIST:1.15 --- pkgsrc/devel/git-base/PLIST:1.14 Wed Sep 7 08:56:33 2016 +++ pkgsrc/devel/git-base/PLIST Sat Feb 25 08:32:57 2017 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.14 2016/09/07 08:56:33 adam Exp $ +@comment $NetBSD: PLIST,v 1.15 2017/02/25 08:32:57 adam Exp $ bin/git bin/git-cvsserver bin/git-receive-pack @@ -115,7 +115,6 @@ libexec/git-core/git-rebase--interactive libexec/git-core/git-rebase--merge libexec/git-core/git-receive-pack libexec/git-core/git-reflog -libexec/git-core/git-relink libexec/git-core/git-remote libexec/git-core/git-remote-ext libexec/git-core/git-remote-fd Index: pkgsrc/devel/git-base/distinfo diff -u pkgsrc/devel/git-base/distinfo:1.58 pkgsrc/devel/git-base/distinfo:1.59 --- pkgsrc/devel/git-base/distinfo:1.58 Sat Feb 4 11:14:47 2017 +++ pkgsrc/devel/git-base/distinfo Sat Feb 25 08:32:57 2017 @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.58 2017/02/04 11:14:47 adam Exp $ +$NetBSD: distinfo,v 1.59 2017/02/25 08:32:57 adam Exp $ -SHA1 (git-2.11.1.tar.xz) = c253e1d3e60d6e512a21e220a7e1c21bda8f28b7 -RMD160 (git-2.11.1.tar.xz) = b0250e6c09ee4aa5516bab2b355854c20673ebdc -SHA512 (git-2.11.1.tar.xz) = c9d4196ad9c4f656b5a25fe688c06248bfce4fadac38e9bc835e5e9063ab95e3d4b3db4174acea0b3b64c5455adc93d39870f2b6009d2dd6aa0edb5a5f5bda40 -Size (git-2.11.1.tar.xz) = 4208132 bytes +SHA1 (git-2.12.0.tar.xz) = 42aafae5c29324b1fee0264a6c804fdffbd1d8d1 +RMD160 (git-2.12.0.tar.xz) = 8ae8a4dc51973d4ad154ce0f08b23122601b9db9 +SHA512 (git-2.12.0.tar.xz) = 8696de600f6800748096de9ccb54a0ba59a9128617fc6c9a5bc48857798a775209b99ad484aef777d5d6b5c3ac172e5e5071740d073e0ac8d52c54561a9bed0b +Size (git-2.12.0.tar.xz) = 4269944 bytes SHA1 (patch-aa) = a58f3c2f45c1fbafd751d10b9ef34e6c9afc2c6f -SHA1 (patch-ac) = 376cdd1c58b143c820ff6395987a8a77cf9b52ba +SHA1 (patch-ac) = e5d2112d158fe493a89b244a10d2e4b998a23d98 SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca SHA1 (patch-af) = 06460f220b4703a1ff98809006ec1aed5017bb23 SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0 Index: pkgsrc/devel/git-base/patches/patch-ac diff -u pkgsrc/devel/git-base/patches/patch-ac:1.2 pkgsrc/devel/git-base/patches/patch-ac:1.3 --- pkgsrc/devel/git-base/patches/patch-ac:1.2 Fri Aug 1 19:18:39 2014 +++ pkgsrc/devel/git-base/patches/patch-ac Sat Feb 25 08:32:57 2017 @@ -1,11 +1,12 @@ -$NetBSD: patch-ac,v 1.2 2014/08/01 19:18:39 schmonz Exp $ +$NetBSD: patch-ac,v 1.3 2017/02/25 08:32:57 adam Exp $ ---- gitk-git/Makefile.orig 2014-05-30 21:38:10.000000000 +0000 +--- gitk-git/Makefile.orig 2017-02-24 19:17:39.000000000 +0000 +++ gitk-git/Makefile -@@ -50,9 +50,9 @@ endif +@@ -50,10 +50,9 @@ endif all:: gitk-wish $(ALL_MSGFILES) install:: all +- $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)' - $(INSTALL) -m 755 gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk - $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(msgsdir_SQ)' - $(foreach p,$(ALL_MSGFILES), $(INSTALL) -m 644 $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true Index: pkgsrc/devel/git-docs/PLIST diff -u pkgsrc/devel/git-docs/PLIST:1.5 pkgsrc/devel/git-docs/PLIST:1.6 --- pkgsrc/devel/git-docs/PLIST:1.5 Fri Jul 31 12:57:23 2015 +++ pkgsrc/devel/git-docs/PLIST Sat Feb 25 08:32:57 2017 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2015/07/31 12:57:23 adam Exp $ +@comment $NetBSD: PLIST,v 1.6 2017/02/25 08:32:57 adam Exp $ man/man1/git-add.1 man/man1/git-am.1 man/man1/git-annotate.1 @@ -99,7 +99,6 @@ man/man1/git-read-tree.1 man/man1/git-rebase.1 man/man1/git-receive-pack.1 man/man1/git-reflog.1 -man/man1/git-relink.1 man/man1/git-remote-ext.1 man/man1/git-remote-fd.1 man/man1/git-remote-testgit.1 Index: pkgsrc/devel/git-gitk/PLIST diff -u pkgsrc/devel/git-gitk/PLIST:1.5 pkgsrc/devel/git-gitk/PLIST:1.6 --- pkgsrc/devel/git-gitk/PLIST:1.5 Mon Dec 5 14:07:32 2016 +++ pkgsrc/devel/git-gitk/PLIST Sat Feb 25 08:32:57 2017 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2016/12/05 14:07:32 adam Exp $ +@comment $NetBSD: PLIST,v 1.6 2017/02/25 08:32:57 adam Exp $ bin/gitk libexec/git-core/git-citool libexec/git-core/git-gui @@ -73,6 +73,7 @@ share/gitk/lib/msgs/hu.msg share/gitk/lib/msgs/it.msg share/gitk/lib/msgs/ja.msg share/gitk/lib/msgs/pt_br.msg +share/gitk/lib/msgs/pt_pt.msg share/gitk/lib/msgs/ru.msg share/gitk/lib/msgs/sv.msg share/gitk/lib/msgs/vi.msg --_----------=_1488011577213280--