summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2020-06-03 14:06:47 +0000
committeradam <adam@pkgsrc.org>2020-06-03 14:06:47 +0000
commit3023cc4d8de88643717e5d53195dc49d43f72405 (patch)
tree5ad0b676713ba683be692b04e8c42495dba9da69
parentbf5a2f3b1f86b187a427194d0237c1cd93275476 (diff)
downloadpkgsrc-3023cc4d8de88643717e5d53195dc49d43f72405.tar.gz
git: updated to 2.27.0
Git 2.27 Release Notes ====================== Updates since v2.26 ------------------- Backward compatibility notes * When "git describe C" finds that commit C is pointed by a signed or annotated tag, which records T as its tagname in the object, the command gives T as its answer. Even if the user renames or moves such a tag from its natural location in the "refs/tags/" hierarchy, "git describe C" would still give T as the answer, but in such a case "git show T^0" would no longer work as expected. There may be nothing at "refs/tags/T" or even worse there may be a different tag instead. Starting from this version, "git describe" will always use the "long" version, as if the "--long" option were given, when giving its output based on such a misplaced tag to work around the problem. * "git pull" issues a warning message until the pull.rebase configuration variable is explicitly given, which some existing users may find annoying---those who prefer not to rebase need to set the variable to false to squelch the warning. * The transport protocol version 2, which was promoted to the default in Git 2.26 release, turned out to have some remaining rough edges, so it has been demoted from the default. UI, Workflows & Features * A handful of options to configure SSL when talking to proxies have been added. * Smudge/clean conversion filters are now given more information (e.g. the object of the tree-ish in which the blob being converted appears, in addition to its path, which has already been given). * When "git describe C" finds an annotated tag with tagname A to be the best name to explain commit C, and the tag is stored in a "wrong" place in the refs/tags hierarchy, e.g. refs/tags/B, the command gave a warning message but used A (not B) to describe C. If C is exactly at the tag, the describe output would be "A", but "git rev-parse A^0" would not be equal as "git rev-parse C^0". The behavior of the command has been changed to use the "long" form i.e. A-0-gOBJECTNAME, which is correctly interpreted by rev-parse. * "git pull" learned to warn when no pull.rebase configuration exists, and neither --[no-]rebase nor --ff-only is given (which would result a merge). * "git p4" learned four new hooks and also "--no-verify" option to bypass them (and the existing "p4-pre-submit" hook). * "git pull" shares many options with underlying "git fetch", but some of them were not documented and some of those that would make sense to pass down were not passed down. * "git rebase" learned the "--no-gpg-sign" option to countermand commit.gpgSign the user may have. * The output from "git format-patch" uses RFC 2047 encoding for non-ASCII letters on From: and Subject: headers, so that it can directly be fed to e-mail programs. A new option has been added to produce these headers in raw. * "git log" learned "--show-pulls" that helps pathspec limited history views; a merge commit that takes the whole change from a side branch, which is normally omitted from the output, is shown in addition to the commits that introduce real changes. * The interactive input from various codepaths are consolidated and any prompt possibly issued earlier are fflush()ed before we read. * Allow "git rebase" to reapply all local commits, even if the may be already in the upstream, without checking first. * The 'pack.useSparse' configuration variable now defaults to 'true', enabling an optimization that has been experimental since Git 2.21. * "git rebase" happens to call some hooks meant for "checkout" and "commit" by this was not a designed behaviour than historical accident. This has been documented. * "git merge" learns the "--autostash" option. * "sparse-checkout" UI improvements. * "git update-ref --stdin" learned a handful of new verbs to let the user control ref update transactions more explicitly, which helps as an ingredient to implement two-phase commit-style atomic ref-updates across multiple repositories. * "git commit-graph write" learned different ways to write out split files. * Introduce an extension to the commit-graph to make it efficient to check for the paths that were modified at each commit using Bloom filters. * The approxidate parser learns to parse seconds with fraction and ignore fractional part. * The userdiff patterns for Markdown documents have been added. * The sparse-checkout patterns have been forbidden from excluding all paths, leaving an empty working tree, for a long time. This limitation has been lifted. * "git restore --staged --worktree" now defaults to take the contents out of "HEAD", instead of erring out. * "git p4" learned to recover from a (broken) state where a directory and a file are recorded at the same path in the Perforce repository the same way as their clients do. * "git multi-pack-index repack" has been taught to honor some repack.* configuration variables. Performance, Internal Implementation, Development Support etc. * The advise API has been revamped to allow more systematic enumeration of advice knobs in the future. * SHA-256 transition continues. * The code to interface with GnuPG has been refactored. * "git stash" has kept an escape hatch to use the scripted version for a few releases, which got stale. It has been removed. * Enable tests that require GnuPG on Windows. * Minor test usability improvement. * Trace2 enhancement to allow logging of the environment variables. * Test clean-up continues. * Perf-test update. * A Windows-specific test element has been made more robust against misuse from both user's environment and programmer's errors. * Various tests have been updated to work around issues found with shell utilities that come with busybox etc. * The config API made mixed uses of int and size_t types to represent length of various pieces of text it parsed, which has been updated to use the correct type (i.e. size_t) throughout. * The "--decorate-refs" and "--decorate-refs-exclude" options "git log" takes have learned a companion configuration variable log.excludeDecoration that sits at the lowest priority in the family. * A new CI job to build and run test suite on linux with musl libc has been added. * Update the CI configuration to use GitHub Actions, retiring the one based on Azure Pipelines. * The directory traversal code had redundant recursive calls which made its performance characteristics exponential with respect to the depth of the tree, which was corrected. * "git blame" learns to take advantage of the "changed-paths" Bloom filter stored in the commit-graph file. * The "bugreport" tool has been added. * The object walk with object filter "--filter=tree:0" can now take advantage of the pack bitmap when available. * Instead of always building all branches at GitHub via Actions, users can specify which branches to build. * Codepaths that show progress meter have been taught to also use the start_progress() and the stop_progress() calls as a "region" to be traced. * Instead of downloading Windows SDK for CI jobs for windows builds from an external site (wingit.blob.core.windows.net), use the one created in the windows-build job, to work around quota issues at the external site.
-rw-r--r--devel/git-base/Makefile3
-rw-r--r--devel/git-base/PLIST4
-rw-r--r--devel/git-base/distinfo11
-rw-r--r--devel/git-base/patches/patch-builtin_receive-pack.c24
-rw-r--r--devel/git-docs/PLIST4
-rw-r--r--devel/git/Makefile.version4
6 files changed, 13 insertions, 37 deletions
diff --git a/devel/git-base/Makefile b/devel/git-base/Makefile
index cbe264af909..e6c848dcad6 100644
--- a/devel/git-base/Makefile
+++ b/devel/git-base/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.81 2020/05/22 10:56:03 adam Exp $
+# $NetBSD: Makefile,v 1.82 2020/06/03 14:06:47 adam Exp $
-PKGREVISION= 2
.include "../../devel/git/Makefile.common"
PKGNAME= git-base-${GIT_VERSION}
diff --git a/devel/git-base/PLIST b/devel/git-base/PLIST
index e91c2ff5ef6..daa1ac3ba60 100644
--- a/devel/git-base/PLIST
+++ b/devel/git-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2020/04/02 07:46:42 adam Exp $
+@comment $NetBSD: PLIST,v 1.30 2020/06/03 14:06:47 adam Exp $
bin/git
bin/git-cvsserver
bin/git-receive-pack
@@ -36,6 +36,7 @@ libexec/git-core/git-bisect
libexec/git-core/git-bisect--helper
libexec/git-core/git-blame
libexec/git-core/git-branch
+libexec/git-core/git-bugreport
libexec/git-core/git-bundle
libexec/git-core/git-cat-file
libexec/git-core/git-check-attr
@@ -94,7 +95,6 @@ libexec/git-core/git-init
libexec/git-core/git-init-db
libexec/git-core/git-instaweb
libexec/git-core/git-interpret-trailers
-libexec/git-core/git-legacy-stash
libexec/git-core/git-log
libexec/git-core/git-ls-files
libexec/git-core/git-ls-remote
diff --git a/devel/git-base/distinfo b/devel/git-base/distinfo
index d9757dcd990..9ad5c3058a1 100644
--- a/devel/git-base/distinfo
+++ b/devel/git-base/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.100 2020/04/20 20:03:32 leot Exp $
+$NetBSD: distinfo,v 1.101 2020/06/03 14:06:47 adam Exp $
-SHA1 (git-2.26.2.tar.xz) = bdb5eb6c014d7c372be70782a5155d964abe2c08
-RMD160 (git-2.26.2.tar.xz) = d73cfb9020e0a346c954d607b5301e2dd0d9b818
-SHA512 (git-2.26.2.tar.xz) = 5d92d07b171c5cd6e89a29c1211c73c1c900cd51c74d690aebfb4a3d0e93b541b09b42b6d6a1a82f5c3d953096771f9a8605c63be139f559f58698c1a0eabcfc
-Size (git-2.26.2.tar.xz) = 6007864 bytes
+SHA1 (git-2.27.0.tar.xz) = 996c0be58e901deb4ef9d0145e7bf98cdf6a0fb3
+RMD160 (git-2.27.0.tar.xz) = 3c8a83b565afefea9e5bf401e69d6b60acd18dcb
+SHA512 (git-2.27.0.tar.xz) = 8ddea44503db7caf1f6080e64555541aa64a7b8761fd6541965ee244d9c4a47befccda1a239f11d86c2ad0ff24923d084f65712f5f2d6cfa178573e3471c6c33
+Size (git-2.27.0.tar.xz) = 6074636 bytes
SHA1 (patch-Documentation_Makefile) = 6025adac0fbb4b403f3954e6dac9d690dfb22daa
SHA1 (patch-Makefile) = 73741b9d9a1b32bb47db48a7c546c4ff10fb41d6
-SHA1 (patch-builtin_receive-pack.c) = 271df08d874a11b41f33aade64352040bc028fa2
SHA1 (patch-config.mak.uname) = 5316873147acf5b6ef29e426946280bb6441c886
SHA1 (patch-git-gui_Makefile) = d00f4da74a437f3a58f0926f2407c974a8efc2c7
SHA1 (patch-gitk-git_Makefile) = e5d2112d158fe493a89b244a10d2e4b998a23d98
diff --git a/devel/git-base/patches/patch-builtin_receive-pack.c b/devel/git-base/patches/patch-builtin_receive-pack.c
deleted file mode 100644
index f8da50e0720..00000000000
--- a/devel/git-base/patches/patch-builtin_receive-pack.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-builtin_receive-pack.c,v 1.1 2019/11/08 12:52:30 ryoon Exp $
-
-* Do not conflict hmac(3) of NetBSD
-
---- builtin/receive-pack.c.orig 2019-11-04 05:07:07.000000000 +0000
-+++ builtin/receive-pack.c
-@@ -417,7 +417,7 @@ static int copy_to_sideband(int in, int
- return 0;
- }
-
--static void hmac(unsigned char *out,
-+static void git_hmac(unsigned char *out,
- const char *key_in, size_t key_len,
- const char *text, size_t text_len)
- {
-@@ -462,7 +462,7 @@ static char *prepare_push_cert_nonce(con
- unsigned char hash[GIT_MAX_RAWSZ];
-
- strbuf_addf(&buf, "%s:%"PRItime, path, stamp);
-- hmac(hash, buf.buf, buf.len, cert_nonce_seed, strlen(cert_nonce_seed));
-+ git_hmac(hash, buf.buf, buf.len, cert_nonce_seed, strlen(cert_nonce_seed));
- strbuf_release(&buf);
-
- /* RFC 2104 5. HMAC-SHA1-80 */
diff --git a/devel/git-docs/PLIST b/devel/git-docs/PLIST
index e5ac1660e3f..c5201b5f555 100644
--- a/devel/git-docs/PLIST
+++ b/devel/git-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2020/01/20 20:07:40 adam Exp $
+@comment $NetBSD: PLIST,v 1.15 2020/06/03 14:06:48 adam Exp $
man/man1/git-add.1
man/man1/git-am.1
man/man1/git-annotate.1
@@ -8,6 +8,7 @@ man/man1/git-archive.1
man/man1/git-bisect.1
man/man1/git-blame.1
man/man1/git-branch.1
+man/man1/git-bugreport.1
man/man1/git-bundle.1
man/man1/git-cat-file.1
man/man1/git-check-attr.1
@@ -167,6 +168,7 @@ man/man7/gitcredentials.7
man/man7/gitcvs-migration.7
man/man7/gitdiffcore.7
man/man7/giteveryday.7
+man/man7/gitfaq.7
man/man7/gitglossary.7
man/man7/gitnamespaces.7
man/man7/gitremote-helpers.7
diff --git a/devel/git/Makefile.version b/devel/git/Makefile.version
index 889817a1351..4f161603661 100644
--- a/devel/git/Makefile.version
+++ b/devel/git/Makefile.version
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.88 2020/04/20 20:03:32 leot Exp $
+# $NetBSD: Makefile.version,v 1.89 2020/06/03 14:06:47 adam Exp $
#
# used by devel/git/Makefile.common
# used by devel/git-cvs/Makefile
# used by devel/git-svn/Makefile
-GIT_VERSION= 2.26.2
+GIT_VERSION= 2.27.0