git: updated to 2.37.2 Git 2.37.2 Release Notes ======================== This primarily is to backport various fixes accumulated on the 'master' front since 2.37.1. Fixes since v2.37.1 ------------------- * "git shortlog -n" relied on the underlying qsort() to be stable, which shouldn't have. Fixed. * Variable quoting fix in the vimdiff driver of "git mergetool". * An earlier attempt to plug leaks placed a clean-up label to jump to at a bogus place, which as been corrected. * Fixes a long-standing corner case bug around directory renames in the merge-ort strategy. * Recent update to vimdiff layout code has been made more robust against different end-user vim settings. * In a non-bare repository, the behavior of Git when the core.worktree configuration variable points at a directory that has a repository as its subdirectory, regressed in Git 2.27 days. * References to commands-to-be-typed-literally in "git rebase" documentation mark-up have been corrected. * Give _() markings to fatal/warning/usage: labels that are shown in front of these messages. * "git mktree --missing" lazily fetched objects that are missing from the local object store, which was totally unnecessary for the purpose of creating the tree object(s) from its input. * Fixes for tests when the source directory has unusual characters in its path, e.g. whitespaces, double-quotes, etc. * Adjust technical/bitmap-format to be formatted by AsciiDoc, and add some missing information to the documentation. * Certain diff options are currently ignored when combined-diff is shown; mark them as incompatible with the feature. * "git clone" from a repository with some ref whose HEAD is unborn did not set the HEAD in the resulting repository correctly, which has been corrected. * mkstemp() emulation on Windows has been improved. * Add missing documentation for "include" and "includeIf" features in "git config" file format, which incidentally teaches the command line completion to include them in its offerings. * Avoid "white/black-list" in documentation and code comments. * Workaround for a compiler warning against use of die() in osx-keychain (in contrib/). * Workaround for a false positive compiler warning. * The resolve-undo information in the index was not protected against GC, which has been corrected. * A corner case bug where lazily fetching objects from a promisor remote resulted in infinite recursion has been corrected. * "git p4" working on UTF-16 files on Windows did not implement CRLF-to-LF conversion correctly, which has been corrected. * "git p4" did not handle non-ASCII client name well, which has been corrected. * "rerere-train" script (in contrib/) used to honor commit.gpgSign while recreating the throw-away merges. * "git checkout" miscounted the paths it updated, which has been corrected. * Fix for a bug that makes write-tree to fail to write out a non-existent index as a tree, introduced in 2.37. * There was a bug in the codepath to upgrade generation information in commit-graph from v1 to v2 format, which has been corrected. Also contains minor documentation updates and code clean-ups.diff -r1.107 -r1.108 pkgsrc/devel/git/Makefile.version
(adam)
@@ -1,7 +1,7 @@ | @@ -1,7 +1,7 @@ | |||
1 | # $NetBSD: Makefile.version,v 1.107 2022/07/14 10:55:36 adam Exp $ | 1 | # $NetBSD: Makefile.version,v 1.108 2022/08/12 08:06:22 adam Exp $ | |
2 | # | 2 | # | |
3 | # used by devel/git/Makefile.common | 3 | # used by devel/git/Makefile.common | |
4 | # used by devel/git-cvs/Makefile | 4 | # used by devel/git-cvs/Makefile | |
5 | # used by devel/git-svn/Makefile | 5 | # used by devel/git-svn/Makefile | |
6 | 6 | |||
7 | GIT_VERSION= 2.37.1 | 7 | GIT_VERSION= 2.37.2 |
@@ -1,11 +1,11 @@ | @@ -1,11 +1,11 @@ | |||
1 | $NetBSD: distinfo,v 1.121 2022/07/14 10:55:37 adam Exp $ | 1 | $NetBSD: distinfo,v 1.122 2022/08/12 08:06:22 adam Exp $ | |
2 | 2 | |||
3 | BLAKE2s (git-2.37.1.tar.xz) = 5068f0c16d70ccd984f61f1cfdc2f4034b52b5e449d07f8d3bd35449bc744e1a | 3 | BLAKE2s (git-2.37.2.tar.xz) = e6cb6d411a89685c737f5e2ebcb0fcc4a7173d6d808400b9bb207b3c141026ae | |
4 | SHA512 (git-2.37.1.tar.xz) = 3c9cad6b4757f425ee53996d8d80db2226b246513cbcec9011022e02e4235d7ec38c7c1aada73bb3c9279a91d1aaf8664633356ce1dce847e0d371f702a5b766 | 4 | SHA512 (git-2.37.2.tar.xz) = a26d83f4eeb71d49c427ced9509861f7677e13e806da729f369ca39b795f8417b789a0adec859f44716f7fbc1190f7d1e6e518e774ad95c89e88442ac125b9c2 | |
5 | Size (git-2.37.1.tar.xz) = 6980388 bytes | 5 | Size (git-2.37.2.tar.xz) = 6985408 bytes | |
6 | SHA1 (patch-Documentation_Makefile) = 6025adac0fbb4b403f3954e6dac9d690dfb22daa | 6 | SHA1 (patch-Documentation_Makefile) = 6025adac0fbb4b403f3954e6dac9d690dfb22daa | |
7 | SHA1 (patch-Makefile) = e3e07365a22c8612e0f5ff3b7befb2bdd788dfb8 | 7 | SHA1 (patch-Makefile) = e3e07365a22c8612e0f5ff3b7befb2bdd788dfb8 | |
8 | SHA1 (patch-config.mak.uname) = 5316873147acf5b6ef29e426946280bb6441c886 | 8 | SHA1 (patch-config.mak.uname) = 5316873147acf5b6ef29e426946280bb6441c886 | |
9 | SHA1 (patch-git-gui_Makefile) = d00f4da74a437f3a58f0926f2407c974a8efc2c7 | 9 | SHA1 (patch-git-gui_Makefile) = d00f4da74a437f3a58f0926f2407c974a8efc2c7 | |
10 | SHA1 (patch-gitk-git_Makefile) = e5d2112d158fe493a89b244a10d2e4b998a23d98 | 10 | SHA1 (patch-gitk-git_Makefile) = e5d2112d158fe493a89b244a10d2e4b998a23d98 | |
11 | SHA1 (patch-templates_Makefile) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0 | 11 | SHA1 (patch-templates_Makefile) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0 |