From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pb-smtp2.pobox.com (pb-smtp2.pobox.com [64.147.108.71]) (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 712641AAD3 for ; Tue, 26 Mar 2024 18:37:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=64.147.108.71 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711478233; cv=none; b=V0ZCn/me7GuuFxdVZrXlO6xek3j89lEx4Sj9IHdXsR7MToou8YnDK9HB4vzpCTPeCfEbHxAR9TRfZFFgyy0WHTdXIWKAEG5HJ75P6g2WspLTZU3jKPB94ww9ufNGkOMKPfQdeygibGJStdeLJSMk076L+6JTLCIKfQV4BbtrLzM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711478233; c=relaxed/simple; bh=ThEEfm0UtFMQHAAowQVhYtt9+uXwm00jjq6on3HmZf4=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=raiTTja++A9hgxdlfCgUjP5XLS4QivPzVSyLoLeioL+uRs6P3Vt/4JPnLmulntJyRcr1+JPOqv0y7Pj2oPWuN6xHN+7bqNiquRDI4Ctjqls8HjKcbiL8fTJQYKhcHs4CWDnljqgkNHtDJz9PJWX1l+T2LUbTEx1yMj1/ZuMQJdw= 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=s9PoBozn; arc=none smtp.client-ip=64.147.108.71 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="s9PoBozn" Received: from pb-smtp2.pobox.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id 2BD791F1C30; Tue, 26 Mar 2024 14:37:09 -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=T hEEfm0UtFMQHAAowQVhYtt9+uXwm00jjq6on3HmZf4=; b=s9PoBoznbj8TyA46M BXJlbsyC75Ye70qHYiY6uM6OVwgdYqQZ0tdhQlpcx4UIEmU7iAOy1bicW460EoC1 7EVsN3BZbVTTRo26dWSSv4YGhuokLaRUuNKrvpt/OjMP+Pp4P7S6cqVsP39IamG7 /xCs2pNOvkTugwhCPRFTYSGpgA= Received: from pb-smtp2.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id 208701F1C2F; Tue, 26 Mar 2024 14:37:09 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [34.125.139.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp2.pobox.com (Postfix) with ESMTPSA id 39F1A1F1C2E; Tue, 26 Mar 2024 14:37:08 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: git@vger.kernel.org Subject: What's cooking in git.git (Mar 2024, #08; Tue, 26) X-master-at: c75fd8d8150afdf836b63a8e0534d9b9e3e111ba X-next-at: e103d9ffe4204bcd16a16bb8522827b4e6855422 Date: Tue, 26 Mar 2024 11:37:06 -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: D9DD9BB8-EB9F-11EE-8B9D-25B3960A682E-77302942!pb-smtp2.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-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'] * bb/sh-scripts-cleanup (2024-03-16) 22 commits (merged to 'next' on 2024-03-18 at 4501a04796) + git-quiltimport: avoid an unnecessary subshell + contrib/coverage-diff: avoid redundant pipelines + t/t9*: merge "grep | sed" pipelines + t/t8*: merge "grep | sed" pipelines + t/t5*: merge a "grep | sed" pipeline + t/t4*: merge a "grep | sed" pipeline + t/t3*: merge a "grep | awk" pipeline + t/t1*: merge a "grep | sed" pipeline + t/t9*: avoid redundant uses of cat + t/t8*: avoid redundant use of cat + t/t7*: avoid redundant use of cat + t/t6*: avoid redundant uses of cat + t/t5*: avoid redundant uses of cat + t/t4*: avoid redundant uses of cat + t/t3*: avoid redundant uses of cat + t/t1*: avoid redundant uses of cat + t/t0*: avoid redundant uses of cat + t/perf: avoid redundant use of cat + t/annotate-tests.sh: avoid redundant use of cat + t/lib-cvs.sh: avoid redundant use of cat + contrib/subtree/t: avoid redundant use of cat + doc: avoid redundant use of cat Shell scripts clean-up. source: <20240315194620.10713-1-dev+git@drbeat.li> * bl/doc-config-fixes (2024-03-16) 2 commits (merged to 'next' on 2024-03-18 at a9038d5a9e) + docs: fix typo in git-config `--default` + docs: clarify file options in git-config `--edit` A few typoes in "git config --help" have been corrected. source: <20240316050149.1182867-2-brianmlyles@gmail.com> * bl/doc-key-val-sep-fix (2024-03-18) 2 commits (merged to 'next' on 2024-03-18 at b2e1babb85) + docs: adjust trailer `separator` and `key_value_separator` language + docs: correct trailer `key_value_separator` description The documentation for "%(trailers[:options])" placeholder in the "--pretty" option of commands in the "git log" family has been updated. source: <20240316035612.752910-1-brianmlyles@gmail.com> * ja/doc-formatting-fix (2024-03-16) 2 commits (merged to 'next' on 2024-03-18 at edde7a576d) + doc: fix some placeholders formating + doc: format alternatives in synopsis Documentation mark-up fix. source: * jc/index-pack-fsck-levels (2024-03-15) 1 commit (merged to 'next' on 2024-03-18 at 243c5f4125) + t5300: fix test_with_bad_commit() Test fix. source: * js/bugreport-no-suffix-fix (2024-03-16) 1 commit (merged to 'next' on 2024-03-18 at 180db8ec38) + bugreport.c: fix a crash in `git bugreport` with `--no-suffix` option "git bugreport --no-suffix" was not supported and instead segfaulted, which has been corrected. source: <9c6f3f5203ae26c501a5711e2610573130bfd550.1710388817.git.gitgitgadget@gmail.com> * rj/restore-plug-leaks (2024-03-14) 1 commit (merged to 'next' on 2024-03-15 at ac10ae7892) + checkout: plug some leaks in git-restore Leaks from "git restore" have been plugged. source: <64c1c3cc-51d7-4168-9731-4389889e1449@gmail.com> -------------------------------------------------- [New Topics] * az/grep-group-error-message-update (2024-03-25) 1 commit - grep: improve errors for unmatched ( and ) Error message clarification. Will merge to 'next'. source: * bc/credential-scheme-enhancement (2024-03-25) 13 commits - credential: add support for multistage credential rounds - strvec: implement swapping two strvecs - t5563: refactor for multi-stage authentication - docs: set a limit on credential line length - credential: enable state capability - credential: add an argument to keep state - http: add support for authtype and credential - docs: indicate new credential protocol fields - credential: gate new fields on capability - credential: add a field for pre-encoded credentials - http: use new headers for each object request - remote-curl: reset headers on new request - credential: add an authtype field The credential helper protocol, together with the HTTP layer, have been enhanced to support authentication schemes different from username & password pair, like Bearer and NTLM. Needs review. source: <20240324011301.1553072-1-sandals@crustytoothpaste.net> * bl/pretty-shorthand-config-fix (2024-03-25) 2 commits - 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. Will merge to 'next'. source: <20240324214316.917513-1-brianmlyles@gmail.com> * ds/grep-doc-updates (2024-03-25) 2 commits - grep docs: describe --no-index further and improve formatting a bit - grep docs: describe --recurse-submodules further and improve formatting a bit Documentation updates. Will merge to 'next'. source: * ja/doc-markup-updates (2024-03-25) 4 commits - doc: git-clone: apply new documentation guidelines - doc: git-init: apply new documentation formatting guidelines - doc: allow literal and emphasis format in doc vs help tests - doc: rework CodingGuidelines with new formatting rules Documentation rules has been explicitly described how to mark-up literal parts and a few manual pages have been updated as examples. Will merge to 'next'? source: * mg/editorconfig-makefile (2024-03-23) 1 commit - editorconfig: add Makefiles to "text files" The .editorconfig file has been taught that a Makefile uses HT indentation. Will merge to 'next'? source: <20240322221813.13019-1-mg@max.gautier.name> * pb/test-scripts-are-build-targets (2024-03-25) 1 commit - t/README: mention test files are make targets The README now gives a hint on running individual tests in the "t/" directory with "make t-*.sh t-*.sh". Will merge to 'next'. source: * ps/reftable-binsearch-updates (2024-03-25) 7 commits - reftable/block: avoid decoding keys when searching restart points - reftable/record: extract function to decode key lengths - reftable/block: fix error handling when searching restart points - reftable/block: refactor binary search over restart points - reftable/refname: refactor binary search over refnames - reftable/basics: improve `binsearch()` test - reftable/basics: fix return type of `binsearch()` to be `size_t` Reftable code clean-up and some bugfixes. Needs review. source: * rs/midx-use-strvec-pushf (2024-03-25) 1 commit - midx: use strvec_pushf() for pack-objects base name Code clean-up. Will merge to 'next'. source: <9483038c-9529-4243-9b9a-97254fac29c1@web.de> * rs/strbuf-expand-bad-format (2024-03-25) 2 commits - cat-file: use strbuf_expand_bad_format() - factor out strbuf_expand_bad_format() Code clean-up. Will merge to 'next'. source: <27cdcde7-74bc-4ee8-bc84-9a6046292cae@web.de> -------------------------------------------------- [Cooking] * 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. Will merge to 'master'. source: <20240320091748.GA2444639@coredump.intra.peff.net> * jk/drop-hg-to-git (2024-03-20) 1 commit (merged to 'next' on 2024-03-21 at 603d614310) + contrib: drop hg-to-git script Remove an ancient and not well maintained Hg-to-git migration script from contrib/. Acked-by: Stelian Pop cf. <37e4cd61-b370-437e-bd42-f98f47d3ad32@popies.net> Will merge to 'master'. source: <20240320094824.GA2445978@coredump.intra.peff.net> * 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. Will merge to 'master'. 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. Will merge to 'master'. source: * tb/pseudo-merge-reachability-bitmap (2024-03-20) 24 commits - t/perf: implement performace tests for pseudo-merge bitmaps - pseudo-merge: implement support for finding existing merges - ewah: `bitmap_equals_ewah()` - pack-bitmap: extra trace2 information - pack-bitmap.c: use pseudo-merges during traversal - t/test-lib-functions.sh: support `--date` in `test_commit_bulk()` - pack-bitmap: implement test helpers for pseudo-merge - ewah: implement `ewah_bitmap_popcount()` - pseudo-merge: implement support for reading pseudo-merge commits - pack-bitmap.c: read pseudo-merge extension - pseudo-merge: scaffolding for reads - pack-bitmap: extract `read_bitmap()` function - pack-bitmap-write.c: write pseudo-merge table - pack-bitmap-write.c: select pseudo-merge commits - pseudo-merge: implement support for selecting pseudo-merge commits - pack-bitmap: make `bitmap_writer_push_bitmapped_commit()` public - pack-bitmap: implement `bitmap_writer_has_bitmapped_object_id()` - pack-bitmap-write: support storing pseudo-merge commits - pseudo-merge.ch: initial commit - pack-bitmap: move some initialization to `bitmap_writer_init()` - pack-bitmap: drop unused `max_bitmaps` parameter - ewah: implement `ewah_bitmap_is_subset()` - config: repo_config_get_expiry() - Documentation/technical: describe pseudo-merge bitmaps format The pack-bitmap machinery has been extended to write bitmaps for pseudo-merges, which are imaginary commits which act as octopus merges covering groups of the un-bitmapped parts of history at reference tips. This is good for ... what ...? Expecting a reroll. cf. source: * jc/release-notes-entry-experiment (2024-03-26) 1 commit - 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. Will merge to 'next'. source: * 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. Will merge to 'master'. source: <20240322103502.GA2045297@coredump.intra.peff.net> * dg/myfirstobjectwalk-updates (2024-03-26) 5 commits - MyFirstObjectWalk: add stderr to pipe processing - MyFirstObjectWalk: fix description for counting omitted objects - MyFirstObjectWalk: fix filtered object walk - MyFirstObjectWalk: fix misspelled "builtins/" - MyFirstObjectWalk: use additional arg in config_fn_t Update a more recent tutorial doc. Waiting for the final Ack. cf. source: * 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. Will merge to 'master'. source: * jc/apply-parse-diff-git-header-names-fix (2024-03-19) 1 commit - apply: parse names out of "diff --git" more carefully "git apply" failed to extract the filename the patch applied to, when the change was about an empty file created in or deleted from a directory whose name ends with a SP, which has been corrected. Needs review. source: * 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. Will merge to 'master'. source: <20240320002555.GB903718@coredump.intra.peff.net> * la/hide-trailer-info (2024-03-16) 7 commits - trailer: retire trailer_info_get() from API - trailer: make trailer_info struct private - trailer: make parse_trailers() return trailer_info pointer - interpret-trailers: access trailer_info with new helpers - sequencer: use the trailer iterator - trailer: teach iterator about non-trailer lines - Merge branch 'la/format-trailer-info' into la/hide-trailer-info (this branch uses la/format-trailer-info.) The trailer API has been reshuffled a bit. source: * 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. Will merge to 'master'. source: * rs/t-prio-queue-fixes (2024-03-18) 2 commits (merged to 'next' on 2024-03-21 at 0730741187) + t-prio-queue: check result array bounds + t-prio-queue: shorten array index message Test clean-up. Will merge to 'master'. source: <9bf36cc8-ff27-44df-b2fb-9f959c781269@web.de> * ps/pack-refs-auto (2024-03-25) 16 commits - builtin/gc: pack refs when using `git maintenance run --auto` - builtin/gc: forward git-gc(1)'s `--auto` flag when packing refs - t6500: extract objects with "17" prefix - builtin/gc: move `struct maintenance_run_opts` - builtin/pack-refs: introduce new "--auto" flag - builtin/pack-refs: release allocated memory - refs/reftable: expose auto compaction via new flag - refs: remove `PACK_REFS_ALL` flag - refs: move `struct pack_refs_opts` to where it's used - t/helper: drop pack-refs wrapper - refs/reftable: print errors on compaction failure - reftable/stack: gracefully handle failed auto-compaction due to locks - reftable/stack: use error codes when locking fails during compaction - reftable/error: discern locked/outdated errors - reftable/stack: fix error handling in `reftable_stack_init_addition()` - Merge branch 'ps/reftable-stack-tempfile' into ps/pack-refs-auto "git pack-refs" learned the "--auto" option, which is a useful addition to be triggered from "git gc --auto". Acked-by: Karthik Nayak cf. Will merge to 'next'. source: * jc/show-untracked-false (2024-03-13) 2 commits (merged to 'next' on 2024-03-21 at 6d1f5603c6) + status: allow --untracked=false and friends + status: unify parsing of --untracked= and status.showUntrackedFiles The status.showUntrackedFiles configuration variable had a name that tempts users to set a Boolean value expressed in our usual "false", "off", and "0", but it only took "no". This has been corrected so "true" and its synonyms are taken as "normal", while "false" and its synonyms are taken as "no". Will merge to 'master'. source: <20240313173214.962532-1-gitster@pobox.com> * ph/diff-src-dst-prefix-config (2024-03-18) 2 commits (merged to 'next' on 2024-03-21 at 96801520db) + diff.*Prefix: use camelCase in the doc and test titles + diff: add diff.srcPrefix and diff.dstPrefix configuration variables "git diff" and friends learned two extra configuration variables. Will merge to 'master'. source: <20240315010310.GA1901653@quokka> 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 something I am not sure what. Will merge to 'master'. source: <0bede59a53862585c49bc635f82e44e983144a7f.1710246859.git.ps@pks.im> * bt/fuzz-config-parse (2024-03-15) 1 commit (merged to 'next' on 2024-03-21 at 6e9f331d68) + fuzz: add fuzzer for config parsing A new fuzz target that exercises config parsing code. Will merge to 'master'. source: * ds/doc-config-reflow (2024-03-14) 1 commit - config.txt: perform some minor reformatting Reflow a paragraph in the documentation source without any effect to the formatted text. Comments? source: <97bdaf075bf5a68554cca1731eca78aff2662907.1710444774.git.dsimic@manjaro.org> * la/format-trailer-info (2024-03-15) 5 commits - trailer: finish formatting unification - trailer: begin formatting unification - format_trailer_info(): append newline for non-trailer lines - format_trailer_info(): drop redundant unfold_value() - format_trailer_info(): use trailer_item objects (this branch is used by la/hide-trailer-info.) The code to format trailers have been cleaned up. Comments? source: * rs/config-comment (2024-03-15) 3 commits - config: allow tweaking whitespace between value and comment - config: fix --comment formatting - config: add --comment option to add a comment "git config" learned "--comment=" option to leave a comment immediately after the "variable = value" on the same line in the configuration file. Waiting for review response. cf. 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=