From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pb-smtp20.pobox.com (pb-smtp20.pobox.com [173.228.157.52]) (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 9064751C44 for ; Mon, 1 Apr 2024 19:09:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=173.228.157.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711998580; cv=none; b=Y2wzoxzX4qM5Z1DgD7OT61JTdxhZlCPS1xCP7Zg/psmurGW8K/bOnZl2u0YOaLRYZVyQPFsgN8QNrlncWiJd6nzhskX9VyKnY5rS9vFyHLyEWvNtNItOX1X3orn9uZBvJ94H+UtDkKDYi9/2aS+/tmFkFzDaagNBAsZov/AFnrc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711998580; c=relaxed/simple; bh=ByOhg+noq0z6ZwZsAMARxZdNFZD/TVnKoa5H0YPpm7M=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=hsN5pfhGWAtf0hBVEP8c1l8DQPzFzUgFGQCnL3Skc9PtTq8wGCakmgHr2mrrLy3z5F/4aOKgGrK6SNl3r42JtVZrWf6bdRgj6Q9lz62ZrEWzM2xJ32UJG1mTYXx4CBjg3BLYRErK30rY+DiQ55oy4pghvV66bQzVXzH42CfxkwA= 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=qE3k+DgK; arc=none smtp.client-ip=173.228.157.52 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="qE3k+DgK" Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id D837021F3E; Mon, 1 Apr 2024 15:09:36 -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=B yOhg+noq0z6ZwZsAMARxZdNFZD/TVnKoa5H0YPpm7M=; b=qE3k+DgK+gUoDo4PH nCI5hy5OAZWaaJXBMMPu7V3RvnWw9wvS9YoMMRhIo13RgJNGJAvgQ2+nmWxAOY36 00dLVvjIArRhej2R1HpoGy2tWy3uZfA0XrP3CrbrlXi87y65Nh6+LoiRM9/tmiyX n/2erojtAmokGipixMmR0Fx2tc= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id CF06521F3D; Mon, 1 Apr 2024 15:09:36 -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-smtp20.pobox.com (Postfix) with ESMTPSA id 1052A21F3C; Mon, 1 Apr 2024 15:09:32 -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, #01; Mon, 1) X-master-at: d6fd04375f9196f8b203d442f235bd96a1a068cc X-next-at: 09a8706636d10c491176b8b1cd6519f7300911bf Date: Mon, 01 Apr 2024 12:09:30 -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: 5EF3DBE0-F05B-11EE-A79A-F515D2CDFF5E-77302942!pb-smtp20.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/ -------------------------------------------------- [New Topics] * es/test-cron-safety (2024-03-31) 1 commit - test-lib: fix non-functioning GIT_TEST_MAINT_SCHEDULER fallback The test script had an incomplete and ineffective attempt to avoid clobbering the testing user's real crontab (and its equivalents), which has been completed. Will merge to 'next'. source: <20240329222703.9343-1-ericsunshine@charter.net> * gt/add-u-commit-i-pathspec-check (2024-03-29) 3 commits - builtin/add: error out when passing untracked path with -u - builtin/commit: error out when passing untracked path with -i - read-cache: optionally collect pathspec matching info "git add -u " and "git commit [-i] " did not diagnose a pathspec element that did not match any files in certain situations, unlike "git add " did. Comments? source: <20240318155219.494206-2-shyamthakkar001@gmail.com> * jc/advice-sans-trailing-whitespace (2024-03-29) 1 commit - advice: omit trailing whitespace The "hint:" messages given by the advice mechanism, when given a message with a blank line, left a line with trailing whitespace, which has been cleansed. Will merge to 'next'. source: * jt/reftable-geometric-compaction (2024-03-29) 3 commits - reftable/stack: make segment end inclusive - reftable/stack: use geometric table compaction - reftable/stack: add env to disable autocompaction The strategy to compat multiple tables of reftables after many operations accumulate many entries has been improved to avoid accumulating too many tables uncollected. Will merge to 'next'? cf. source: * ds/typofix-core-config-doc (2024-03-31) 1 commit - config: fix some small capitalization issues, as spotted Typofix. Will merge to 'next'. source: <26135b06c48565ee8ac6dcfc1ef5431511e6202c.1711918168.git.dsimic@manjaro.org> * jc/checkout-detach-wo-tracking-report (2024-03-30) 1 commit - checkout: omit "tracking" information on a detached HEAD "git checkout/switch --detach foo", after switching to the detached HEAD state, gave the tracking information for the 'foo' branch, which was pointless. Comments? source: * rj/use-adv-if-enabled (2024-03-30) 3 commits - add: use advise_if_enabled for ADVICE_ADD_EMBEDDED_REPO - add: use advise_if_enabled for ADVICE_ADD_EMPTY_PATHSPEC - add: use advise_if_enabled for ADVICE_ADD_IGNORED_FILE Use advice_if_enabled() API to rewrite a simple pattern to call advise() after checking advice_enabled(). Will merge to 'next'? source: <46fba030-d7aa-49d2-88fa-e506850f7b6a@gmail.com> * rs/mem-pool-size-t-safety (2024-03-31) 1 commit - mem-pool: use st_add() in mem_pool_strvfmt() size_t arithmetic safety. Will merge to 'next'. source: -------------------------------------------------- [Cooking] * ew/khash-to-khashl (2024-03-28) 3 commits - khashl: fix ensemble lookups on empty table - treewide: switch to khashl for memory savings - list-objects-filter: use kh_size API The hashtable library "khash.h" has been replaced with "khashl.h" that has better memory usage characteristics. Needs review. source: <20240328101356.300374-1-e@80x24.org> * ps/reftable-block-iteration-optim (2024-03-27) 9 commits - reftable/block: reuse `zstream` state on inflation - reftable/block: open-code call to `uncompress2()` - reftable/block: reuse uncompressed blocks - reftable/reader: iterate to next block in place - reftable/block: move ownership of block reader into `struct table_iter` - reftable/block: introduce `block_reader_release()` - reftable/block: better grouping of functions - reftable/block: merge `block_iter_seek()` and `block_reader_seek()` - reftable/block: rename `block_reader_start()` The code to iterate over reftable blocks has seen some optimization to reduce memory allocation and deallocation. Needs review. source: * rj/add-p-explicit-reshow (2024-03-29) 2 commits - add-patch: do not print hunks repeatedly - add-patch: introduce 'p' in interactive-patch "git add -p" and other "interactive hunk selection" UI has learned to skip showing the hunk immediately after it has already been shown, and an additional action to explicitly ask to reshow the current hunk. Will merge to 'next'? source: * 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. Will merge to 'master'. source: * bc/credential-scheme-enhancement (2024-03-27) 12 commits . credential: add support for multistage credential rounds . 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. Expecting a reroll. cf. source: <20240324011301.1553072-1-sandals@crustytoothpaste.net> * 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. Will merge to 'master'. source: <20240324214316.917513-1-brianmlyles@gmail.com> * 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. Will merge to 'master'. source: * ja/doc-markup-updates (2024-03-29) 5 commits - doc: git-clone: do not autoreference the manpage in itself - doc: git-clone: apply new documentation formatting 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 (merged to 'next' on 2024-03-27 at 9ef22a39b6) + 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 'master'. 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 (merged to 'next' on 2024-03-27 at 16969df3e8) + midx: use strvec_pushf() for pack-objects base name Code clean-up. Will merge to 'master'. source: <9483038c-9529-4243-9b9a-97254fac29c1@web.de> * rs/strbuf-expand-bad-format (2024-03-25) 2 commits (merged to 'next' on 2024-03-27 at 1f9dbf70a0) + cat-file: use strbuf_expand_bad_format() + factor out strbuf_expand_bad_format() Code clean-up. Will merge to 'master'. source: <27cdcde7-74bc-4ee8-bc84-9a6046292cae@web.de> * 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> * 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 learned to write pseudo-merge bitmaps, which act as imaginary octopus merges covering un-bitmapped reference tips. This enhances bitmap coverage, and thus, performance, for repositories with many references using bitmaps. Expecting a reroll. cf. 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. Will merge to 'master'. 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-27) 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. Will merge to 'next'? 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-29) 3 commits - t4126: fix "funny directory name" test on Windows (again) (merged to 'next' on 2024-03-28 at a35de15836) + t4126: make sure a directory with SP at the end is usable (merged to 'next' on 2024-03-27 at d586367985) + 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. Will merge to 'next'? source: source: 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. Needs review. 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: * 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: * 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> * 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. Will discard. 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 (merged to 'next' on 2024-03-28 at 83eaadc2b6) + 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. Will merge to 'master'. 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=