From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pb-smtp1.pobox.com (pb-smtp1.pobox.com [64.147.108.70]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3979F692FC for ; Wed, 3 Apr 2024 23:12:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=64.147.108.70 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712185967; cv=none; b=PwGBD3sVvD7qLfAnVjBipAPyK9ThptN2glOCPYpoRy9rlPCAONHIasz3r7oyoKGFpFXXbnEbgnRoPW4pZhYvSlAhf2pDQJcbEZz8DL+s+0f9uhAkOLmk/ltFQ1FHmQ/cZiMZC0PS04ibSLaxdg4cJhpK3hD4PU+mgtlJjlIua5A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712185967; c=relaxed/simple; bh=lSF38cKp/ZAhT5SmHfIGR5RAO21nJ4Zy7ZgMCUpZ1bM=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=iHkatccJw0Em1PHvl0FWT2dmPL5PC1QCxQfEHrNhYi34N9VeALfA4zuhlCzpJZAs8R7/9jYXS8b5vQVFQh9RMB90tXdmWVjSKpejDkhWNftycq4hbaxZx8IzbEKLxIwIK/wbjqpf1V5Jss+uDsf7CvrF770zhz0nMe1gbyAPogE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=pobox.com; spf=pass smtp.mailfrom=pobox.com; dkim=pass (1024-bit key) header.d=pobox.com header.i=@pobox.com header.b=ssU7u0zY; arc=none smtp.client-ip=64.147.108.70 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=pobox.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pobox.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=pobox.com header.i=@pobox.com header.b="ssU7u0zY" Received: from pb-smtp1.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id AAC071DE5B1; Wed, 3 Apr 2024 19:12:43 -0400 (EDT) (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; s=sasl; bh=l SF38cKp/ZAhT5SmHfIGR5RAO21nJ4Zy7ZgMCUpZ1bM=; b=ssU7u0zYFbGEypeTH EJ2nW6nz3FKV4V4Rz5rVAu03rKA9KvDwrY2vnpgF4XBnwhfyxDKNW0eYpoTCUVVS BXPBuhr/je941Vcp7XOFgwFAanANBylTNASHvcpIxPRDSDIe9GA8fR4k8/nxpzFN AdsyTkrtw6G97hn7CXIy0XDlIE= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id A1BA51DE5B0; Wed, 3 Apr 2024 19:12:43 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [34.125.229.118]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp1.pobox.com (Postfix) with ESMTPSA id DD3C91DE5AF; Wed, 3 Apr 2024 19:12:42 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: git@vger.kernel.org Subject: What's cooking in git.git (Apr 2024, #02; Wed, 3) X-master-at: 7774cfed6261ce2900c84e55906da708c711d601 X-next-at: 4b32163adf4863c6df3bb6b43540fa2ca3494e28 Date: Wed, 03 Apr 2024 16:12:41 -0700 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: AC994E6A-F20F-11EE-B7B0-78DCEB2EC81B-77302942!pb-smtp1.pobox.com 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', and aren't considered "accepted" at all and may be annotated with an URL to a message that raises issues but they are no means exhaustive. A topic without enough support may be discarded after a long period of no activity (of course they can be resubmit when new interests arise). 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-scm/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'] * az/grep-group-error-message-update (2024-03-25) 1 commit (merged to 'next' on 2024-03-27 at 567bf00ed4) + grep: improve errors for unmatched ( and ) Error message clarification. source: * bl/cherry-pick-empty (2024-03-25) 7 commits (merged to 'next' on 2024-03-28 at 22e8e4a68e) + cherry-pick: add `--empty` for more robust redundant commit handling + cherry-pick: enforce `--keep-redundant-commits` incompatibility + sequencer: do not require `allow_empty` for redundant commit options + sequencer: handle unborn branch with `--allow-empty` + rebase: update `--empty=ask` to `--empty=stop` + docs: clean up `--empty` formatting in git-rebase(1) and git-am(1) + docs: address inaccurate `--empty` default with `--exec` Allow git-cherry-pick(1) to automatically drop redundant commits via a new `--empty` option, similar to the `--empty` options for git-rebase(1) and git-am(1). Includes a soft deprecation of `--keep-redundant-commits` as well as some related docs changes and sequencer code cleanup. cf. source: <20240119060721.3734775-2-brianmlyles@gmail.com> * bl/pretty-shorthand-config-fix (2024-03-25) 2 commits (merged to 'next' on 2024-03-28 at e2749914ab) + pretty: find pretty formats case-insensitively + pretty: update tests to use `test_config` The "--pretty=" option of the commands in the "git log" family, defined as "[pretty] shortHand = " should have been looked up case insensitively, but was not, which has been corrected. source: <20240324214316.917513-1-brianmlyles@gmail.com> * ds/config-internal-whitespace-fix (2024-03-21) 4 commits (merged to 'next' on 2024-03-25 at f3393cabe5) + config.txt: describe handling of whitespace further + t1300: add more tests for whitespace and inline comments + config: really keep value-internal whitespace verbatim + config: minor addition of whitespace "git config" corrupted literal HT characters written in the configuration file as part of a value, which has been corrected. source: * ds/grep-doc-updates (2024-03-25) 2 commits (merged to 'next' on 2024-03-27 at 681f08cbc5) + grep docs: describe --no-index further and improve formatting a bit + grep docs: describe --recurse-submodules further and improve formatting a bit Documentation updates. source: * jc/release-notes-entry-experiment (2024-03-26) 1 commit (merged to 'next' on 2024-03-27 at 74ebe224e9) + SubmittingPatches: release-notes entry experiment Introduce an experimental protocol for contributors to propose the topic description to be used in the "What's cooking" report, the merge commit message for the topic, and in the release notes and document it in the SubmittingPatches document. source: * jk/doc-remote-helpers-markup-fix (2024-03-20) 1 commit (merged to 'next' on 2024-03-25 at 7c3dd28ca5) + doc/gitremote-helpers: fix more missing single-quotes Documentation mark-up fix. source: <20240320091748.GA2444639@coredump.intra.peff.net> * jk/pretty-subject-cleanup (2024-03-22) 7 commits (merged to 'next' on 2024-03-22 at 2796f347ad) + format-patch: fix leak of empty header string + format-patch: simplify after-subject MIME header handling + format-patch: return an allocated string from log_write_email_headers() + log: do not set up extra_headers for non-email formats + pretty: drop print_email_subject flag + pretty: split oneline and email subject printing + shortlog: stop setting pp.print_email_subject Code clean-up in the "git log" machinery that implements custom log message formatting. source: <20240320002555.GB903718@coredump.intra.peff.net> * jk/rebase-apply-leakfix (2024-03-22) 1 commit (merged to 'next' on 2024-03-25 at f9358272af) + rebase: use child_process_clear() to clean Leakfix. source: <20240322103502.GA2045297@coredump.intra.peff.net> * jk/remote-helper-object-format-option-fix (2024-03-20) 3 commits (merged to 'next' on 2024-03-27 at 5c9d5be660) + transport-helper: send "true" value for object-format option + transport-helper: drop "object-format " option + transport-helper: use write helpers more consistently The implementation and documentation of "object-format" option exchange between the Git itself and its remote helpers did not quite match, which has been corrected. source: <20240320093226.GA2445531@coredump.intra.peff.net> * pb/advice-merge-conflict (2024-03-18) 2 commits (merged to 'next' on 2024-03-25 at 4414e31d81) + builtin/am: allow disabling conflict advice + sequencer: allow disabling conflict advice Hints that suggest what to do after resolving conflicts can now be squelched by disabling advice.mergeConflict. Acked-by: Phillip Wood cf. source: * pb/test-scripts-are-build-targets (2024-03-25) 1 commit (merged to 'next' on 2024-03-27 at 9ef22a39b6) + t/README: mention test files are make targets The t/README file now gives a hint on running individual tests in the "t/" directory with "make t-*.sh t-*.sh". source: * ps/clone-with-includeif-onbranch (2024-03-12) 1 commit (merged to 'next' on 2024-03-25 at 8d11bd8bd4) + t5601: exercise clones with "includeIf.*.onbranch" An additional test to demonstrate that clone would not choke on a global configuration file that uses includeIf.onbranch:*.path. source: <0bede59a53862585c49bc635f82e44e983144a7f.1710246859.git.ps@pks.im> * ps/reftable-unit-test-nfs-workaround (2024-03-21) 1 commit (merged to 'next' on 2024-03-25 at 4d3d391330) + reftable: fix tests being broken by NFS' delete-after-close semantics A unit test for reftable code tried to enumerate all files in a directory after reftable operations and expected to see nothing but the files it wanted to leave there, but was fooled by .nfs* cruft files left, which has been corrected. source: <8ac5e94a3930cdd2aee9ea86acda3155674b635c.1711035529.git.ps@pks.im> * ps/t7800-variable-interpolation-fix (2024-03-22) 3 commits (merged to 'next' on 2024-03-25 at e7b1ec4df4) + t/README: document how to loop around test cases + t7800: use single quotes for test bodies + t7800: improve test descriptions with empty arguments Fix the way recently added tests interpolate variables defined outside them, and document the best practice to help future developers. source: * pw/checkout-conflict-errorfix (2024-03-14) 5 commits (merged to 'next' on 2024-03-22 at 9977ac6c75) + checkout: fix interaction between --conflict and --merge + checkout: cleanup --conflict=