From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_PASS,SPF_PASS,URIBL_CSS,URIBL_CSS_A shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 1DC041F953 for ; Thu, 6 Jan 2022 01:56:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344471AbiAFB4v (ORCPT ); Wed, 5 Jan 2022 20:56:51 -0500 Received: from pb-smtp20.pobox.com ([173.228.157.52]:51748 "EHLO pb-smtp20.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344461AbiAFB4u (ORCPT ); Wed, 5 Jan 2022 20:56:50 -0500 Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 4C16717D640; Wed, 5 Jan 2022 20:56:49 -0500 (EST) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=sasl; bh=k/rZiDOvNLZYDalutyLjN6sUi dhd+N3hRhyjdjgNmo4=; b=DKBgGDJ2oP3VC6griQYbAWruypCe2Ovjk3JmUcAc9 /Gp3ZvfMAnCejbxYysWi3i79dbi/PD1w6C0NAzKYLMhmjOaK25emxDk6rVGgt/Gg VZSm9ON6Vgvja6Nwq6bPA8Ke+2OvZm4lN4dNqddcr7Qy7tKodythQkR9MPQYNjDo HQ= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 4473417D63F; Wed, 5 Jan 2022 20:56:49 -0500 (EST) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [104.133.2.91]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp20.pobox.com (Postfix) with ESMTPSA id A463C17D63E; Wed, 5 Jan 2022 20:56:46 -0500 (EST) (envelope-from junio@pobox.com) From: Junio C Hamano To: git@vger.kernel.org Subject: What's cooking in git.git (Jan 2022, #02; Wed, 5) X-master-at: e83ba647f7c61cf945690d6a0bd8c172a6498dc8 X-next-at: 24525b3c66f3a5878e67d92b3e0fd082dc1d905e Date: Wed, 05 Jan 2022 17:56:45 -0800 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 X-Pobox-Relay-ID: E79F650A-6E93-11EC-8C17-C85A9F429DF0-77302942!pb-smtp20.pobox.com Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org It's a bit early to publish another issue of this report, but a bunch of topics have graduated to 'master' and a handful of topics have joined 'next', so here is the second installment of the month. About 25 topics are cooking in 'next', all of which hopefully can be in the upcoming release. Those not yet in may need bumping, but it was expected to be a slow cycle due to end-of-year holidays, so it is also OK to give them enough time to get polished into good enough shape, rather than merging them prematurely. Here are the topics that have been cooking in my tree. Commits prefixed with '+' are in 'next' (being in 'next' is a sign that a topic is stable enough to be used and are candidate to be in a future release). Commits prefixed with '-' are only in 'seen', which means nothing more than that I have found them of interest for some reason (like "it may have hard-to-resolve conflicts with another topic already in flight" or "this may turn out to be useful"). Do not read too much into a topic being in (or not in) 'seen'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. Copies of the source code to Git live in many repositories, and the following is a list of the ones I push into or their mirrors. Some repositories have only a subset of branches. With maint, master, next, seen, todo: git://git.kernel.org/pub/scm/git/git.git/ git://repo.or.cz/alt-git.git/ https://kernel.googlesource.com/pub/scm/git/git/ https://github.com/git/git/ https://gitlab.com/git-vcs/git/ With all the integration branches and topics broken out: https://github.com/gitster/git/ Even though the preformatted documentation in HTML and man format are not sources, they are published in these repositories for convenience (replace "htmldocs" with "manpages" for the manual pages): git://git.kernel.org/pub/scm/git/git-htmldocs.git/ https://github.com/gitster/git-htmldocs.git/ Release tarballs are available at: https://www.kernel.org/pub/software/scm/git/ -------------------------------------------------- [Graduated to 'master'] * ds/repack-fixlets (2021-12-20) 2 commits (merged to 'next' on 2021-12-27 at 8f8474ae84) + repack: make '--quiet' disable progress + repack: respect kept objects with '--write-midx -b' Two fixes around "git repack". source: * en/keep-cwd (2021-12-09) 11 commits (merged to 'next' on 2021-12-27 at 7cd8f7fdc0) + t2501: simplify the tests since we can now assume desired behavior + dir: new flag to remove_dir_recurse() to spare the original_cwd + dir: avoid incidentally removing the original_cwd in remove_path() + stash: do not attempt to remove startup_info->original_cwd + rebase: do not attempt to remove startup_info->original_cwd + clean: do not attempt to remove startup_info->original_cwd + symlinks: do not include startup_info->original_cwd in dir removal + unpack-trees: add special cwd handling + unpack-trees: refuse to remove startup_info->original_cwd + setup: introduce startup_info->original_cwd + t2501: add various tests for removing the current working directory Many git commands that deal with working tree files try to remove a directory that becomes empty (i.e. "git switch" from a branch that has the directory to another branch that does not would attempt remove all files in the directory and the directory itself). This drops users into an unfamiliar situation if the command was run in a subdirectory that becomes subject to removal due to the command. The commands have been taught to keep an empty directory if it is the directory they were started in to avoid surprising users. source: * gh/gpg-doc-markup-fix (2021-12-17) 1 commit (merged to 'next' on 2021-12-27 at 7988d71a27) + docs: add missing colon to Documentation/config/gpg.txt Doc markup fix. source: <20211217161718.15767-1-greg@hurrell.net> * jc/flex-array-definition (2021-12-08) 1 commit (merged to 'next' on 2021-12-27 at 9db6a814b7) + flex-array: simplify compiler-specific workaround The conditions to choose different definitions of the FLEX_ARRAY macro for vendor compilers has been simplified to make it easier to maintain. source: * jc/merge-detached-head-name (2021-12-20) 1 commit (merged to 'next' on 2021-12-27 at 01f9fe17b9) + merge: allow to pretend a merge is made into a different branch The default merge message prepared by "git merge" records the name of the current branch; the name can be overridden with a new option to allow users to pretend a merge is made on a different branch. source: * jc/t4204-do-not-write-git-on-upstream-of-pipe (2021-12-16) 1 commit (merged to 'next' on 2021-12-27 at dc2c5db807) + t4204 is not sanitizer clean at all Test fixes. source: * jh/p4-rcs-expansion-in-bytestring (2021-12-16) 5 commits (merged to 'next' on 2021-12-27 at 650cb248ea) + git-p4: resolve RCS keywords in bytes not utf-8 + git-p4: open temporary patch file for write only + git-p4: add raw option to read_pipelines + git-p4: pre-compile RCS keyword regexes + git-p4: use with statements to close files after use in patchRCSKeywor= ds The RCS keyword substitution in "git p4" used to be done assuming that the contents are UTF-8 text, which can trigger decoding errors. We now treat the contents as a bytestring for robustness and correctness. source: <20211216134619.2048348-1-jholdsworth@nvidia.com> * jk/ssh-signing-doc-markup-fix (2021-12-15) 1 commit (merged to 'next' on 2021-12-27 at 2188dc2023) + doc/config: mark ssh allowedSigners example as literal Docfix. source: * jv/use-larger-buffer-in-upload-pack (2021-12-15) 1 commit (merged to 'next' on 2021-12-27 at 3a1afc1ef8) + upload-pack.c: increase output buffer size "git upload-pack" (the other side of "git fetch") used a 8kB buffer but most of its payload came on 64kB "packets". The buffer size has been enlarged so that such a packet fits. source: <20211214194626.33814-1-jacob@gitlab.com> * km/help-prompt-fix (2021-12-16) 1 commit (merged to 'next' on 2021-12-27 at a16d8fa62a) + help: make auto-correction prompt more consistent Among some code paths that ask an yes/no question, only one place gave a prompt that looked different from the others, which has been updated to match what the others create. source: * pw/diff-color-moved-fix (2021-12-09) 15 commits (merged to 'next' on 2021-12-27 at 443dd9f97f) + diff --color-moved: intern strings + diff: use designated initializers for emitted_diff_symbol + diff --color-moved-ws=3Dallow-indentation-change: improve hash lookups + diff --color-moved: stop clearing potential moved blocks + diff --color-moved: shrink potential moved blocks as we go + diff --color-moved: unify moved block growth functions + diff --color-moved: call comparison function directly + diff --color-moved-ws=3Dallow-indentation-change: simplify and optimiz= e + diff: simplify allow-indentation-change delta calculation + diff --color-moved: avoid false short line matches and bad zebra color= ing + diff --color-moved=3Dzebra: fix alternate coloring + diff --color-moved: rewind when discarding pmb + diff --color-moved: factor out function + diff --color-moved: clear all flags on blocks that are too short + diff --color-moved: add perf tests Correctness and performance update to "diff --color-moved" feature. source: * rs/daemon-plug-leak (2021-12-20) 1 commit (merged to 'next' on 2021-12-27 at 55b058a8bb) + daemon: plug memory leak on overlong path Plug a memory leak. source: <5b151dc3-d4c7-29d3-71ed-a79033693d5d@web.de> * rs/log-invert-grep-with-headers (2021-12-17) 1 commit (merged to 'next' on 2021-12-27 at 861648fe8c) + log: let --invert-grep only invert --grep "git log --invert-grep --author=3D" used to exclude commits written by the given author, but now "--invert-grep" only affects the matches made by the "--grep=3D" option. source: * rs/pcre2-utf (2021-12-20) 2 commits (merged to 'next' on 2021-12-27 at 5dc740c331) + grep/pcre2: factor out literal variable + grep/pcre2: use PCRE2_UTF even with ASCII patterns "git grep --perl-regexp" failed to match UTF-8 characters with wildcard when the pattern consists only of ASCII letters, which has been corrected. source: <5fa6962e-3c1c-6dbc-f6d7-589151a9baec@web.de> * rs/t4202-invert-grep-test-fix (2021-12-17) 1 commit (merged to 'next' on 2021-12-27 at b09cee1626) + t4202: fix patternType setting in --invert-grep test Test fix. source: <79dcebc0-e569-cc8a-4702-c572b062ed6d@web.de> * xw/am-empty (2021-12-15) 3 commits (merged to 'next' on 2021-12-27 at 562e1552f6) + am: support --allow-empty to record specific empty patches + am: support --empty=3D