From: Junio C Hamano Date: Fri, 28 May 2021 06:13:52 GMT Subject: [ANNOUNCE] Git v2.32.0-rc2 Message-ID: A release candidate Git v2.32.0-rc2 is now available for testing at the usual places. It is comprised of 586 non-merge commits since v2.31.0, contributed by 83 people, 31 of which are new faces [*]. There have been a handful of regression found since v2.32.0-rc0 was tagged, and this has fixes to them. https://tinyurl.com/gitCal says that we plan to have another release candidate mid next week, but we may go straight to the final 2.32 instead. Let's see how this one fares before deciding. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/testing/ The following public repositories all have a copy of the 'v2.32.0-rc2' tag and the 'master' branch that the tag points at: url = https://git.kernel.org/pub/scm/git/git url = https://kernel.googlesource.com/pub/scm/git/git url = git://repo.or.cz/alt-git.git url = https://github.com/gitster/git New contributors whose contributions weren't in v2.31.0 are as follows. Welcome to the Git development community! Adam Sharafeddine, Andrey Bienkowski, Atharva Raykar, Bruno Albuquerque, Chinmoy Chakraborty, Christopher Schenk, Dan Moseley, David Emett, Dmitry Torilov, Fabien Terrani, Firmin Martin, Georgios Kontaxis, Jason Gore, Jerry Zhang, Joachim Kuebart, Joseph Vusich, Josh Soref, Julien Richard, Li Linchao, Louis Sautier, Luke Shumaker, Nicholas Clark, Peter Oliver, Renato Botelho, Robert Foss, RyotaK, Sardorbek Imomaliev, Tom Saeger, Will Chandler, Wolfgang Müller, and Yiyuan guo. Returning contributors who helped this release are as follows. Thanks for your continued support. Adam Dinwoodie, Ævar Arnfjörð Bjarmason, Alex Henrie, Andrzej Hunt, Bagas Sanjaya, Ben Humphreys, brian m. carlson, Charvi Mendiratta, Christian Couder, Dennis Ameling, Denton Liu, Derrick Stolee, Đoàn Trần Công Danh, Elijah Newren, Eric Sunshine, Eric Wong, Han-Wen Nienhuys, Han Xin, Jeff Hostetler, Jeff King, Johannes Schindelin, Johannes Sixt, John Szakmeister, Jonathan Nieder, Jonathan Tan, Junio C Hamano, Kyle Meyer, Lénaïc Huard, Luke Diamand, Marc Branchaud, Martin Ågren, Matheus Tavares, Nguyễn Thái Ngọc Duy, Nipunn Koorapati, Øystein Walle, Patrick Steinhardt, Phillip Wood, Rafael Silva, Ramkumar Ramachandra, Ramsay Jones, Randall S. Becker, René Scharfe, Sergey Organov, Shubham Verma, Son Luong Ngoc, SZEDER Gábor, Taylor Blau, Todd Zullinger, Torsten Bögershausen, Trygve Aaberge, Ville Skyttä, and ZheNing Hu. [*] We are counting not just the authorship contribution but issue reporting, testing and reviewing that are recorded in the commit trailers. ---------------------------------------------------------------- Git 2.32 Release Notes (draft) ============================== Backward compatibility notes ---------------------------- * ".gitattributes", ".gitignore", and ".mailmap" files that are symbolic links are ignored. * "git apply --3way" used to first attempt a straight application, and only fell back to the 3-way merge algorithm when the stright application failed. Starting with this version, the command will first try the 3-way merge algorithm and only when it fails (either resulting with conflict or the base versions of blobs are missing), falls back to the usual patch application. Updates since v2.31 ------------------- UI, Workflows & Features * It does not make sense to make ".gitattributes", ".gitignore" and ".mailmap" symlinks, as they are supposed to be usable from the object store (think: bare repositories where HEAD:.mailmap etc. are used). When these files are symbolic links, we used to read the contents of the files pointed by them by mistake, which has been corrected. * "git stash show" learned to optionally show untracked part of the stash. * "git log --format='...'" learned "%(describe)" placeholder. * "git repack" so far has been only capable of repacking everything under the sun into a single pack (or split by size). A cleverer strategy to reduce the cost of repacking a repository has been introduced. * The http codepath learned to let the credential layer to cache the password used to unlock a certificate that has successfully been used. * "git commit --fixup=", which was to tweak the changes made to the contents while keeping the original log message intact, learned "--fixup=(amend|reword):", that can be used to tweak both the message and the contents, and only the message, respectively. * "git send-email" learned to honor the core.hooksPath configuration. * "git format-patch -v" learned to allow a reroll count that is not an integer. * "git commit" learned "--trailer [=]" option; together with the interpret-trailers command, this will make it easier to support custom trailers. * "git clone --reject-shallow" option fails the clone as soon as we notice that we are cloning from a shallow repository. * A configuration variable has been added to force tips of certain refs to be given a reachability bitmap. * "gitweb" learned "e-mail privacy" feature to redact strings that look like e-mail addresses on various pages. * "git apply --3way" has always been "to fall back to 3-way merge only when straight application fails". Swap the order of falling back so that 3-way is always attempted first (only when the option is given, of course) and then straight patch application is used as a fallback when it fails. * "git apply" now takes "--3way" and "--cached" at the same time, and work and record results only in the index. * The command line completion (in contrib/) has learned that CHERRY_PICK_HEAD is a possible pseudo-ref. * Userdiff patterns for "Scheme" has been added. * "git log" learned "--diff-merges=