From: Junio C Hamano Date: Fri, 5 Apr 2024 18:36:18 +0000 (-0700) Subject: What's cooking (2024/04 #03) X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dcad79e4bc5d6b8fe48c73039f2bdfe2f0f74397;p=thirdparty%2Fgit.git What's cooking (2024/04 #03) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index 0f1a41bdd6..9876d580d5 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,10 +1,10 @@ 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 +Subject: What's cooking in git.git (Apr 2024, #03; Fri, 5) +X-master-at: 19981daefd7c147444462739375462b49412ce33 +X-next-at: 6705b92e7a998ba6c9ef97c43fa7dc2dcf631e7a Bcc: lwn@lwn.net, gitster@pobox.com -What's cooking in git.git (Apr 2024, #02; Wed, 3) +What's cooking in git.git (Apr 2024, #03; Fri, 5) -------------------------------------------------- Here are the topics that have been cooking in my tree. Commits @@ -48,207 +48,134 @@ Release tarballs are available at: -------------------------------------------------- [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 +* jk/core-comment-string (2024-03-27) 17 commits + (merged to 'next' on 2024-03-28 at fbf8eb9331) + + config: add core.commentString + + config: allow multi-byte core.commentChar + + environment: drop comment_line_char compatibility macro + + wt-status: drop custom comment-char stringification + + sequencer: handle multi-byte comment characters when writing todo list + + find multi-byte comment chars in unterminated buffers + + find multi-byte comment chars in NUL-terminated strings + + prefer comment_line_str to comment_line_char for printing + + strbuf: accept a comment string for strbuf_add_commented_lines() + + strbuf: accept a comment string for strbuf_commented_addf() + + strbuf: accept a comment string for strbuf_stripspace() + + environment: store comment_line_char as a string + + strbuf: avoid shadowing global comment_line_char name + + commit: refactor base-case of adjust_comment_line_char() + + strbuf: avoid static variables in strbuf_add_commented_lines() + + strbuf: simplify comment-handling in add_lines() helper + + config: forbid newline as core.commentChar - Code clean-up in the "git log" machinery that implements custom log - message formatting. - source: <20240320002555.GB903718@coredump.intra.peff.net> + core.commentChar used to be limited to a single byte, but has been + updated to allow an arbitrary multi-byte sequence. + source: <20240312091013.GA95442@coredump.intra.peff.net> + source: <20240327081922.GA830163@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 +* 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 - Leakfix. - source: <20240322103502.GA2045297@coredump.intra.peff.net> + "git config" learned "--comment=" option to leave a + comment immediately after the "variable = value" on the same line + in the configuration file. + source: -* 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 +* rs/retire-mksnpath (2024-04-04) 1 commit + - apply: replace mksnpath() with a mkpathdup() call - 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> + Replace the only remaining caller of mksnpath() with mkpathdup() to + lift the hardcoded path length limit, and retire the function. + Expecting a retitle and reroll? + cf. + 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 +-------------------------------------------------- +[New Topics] - Hints that suggest what to do after resolving conflicts can now be - squelched by disabling advice.mergeConflict. +* ma/win32-unix-domain-socket (2024-04-03) 1 commit + - Win32: detect unix socket support at runtime - Acked-by: Phillip Wood - cf. - source: + Windows binary used to decide the use of unix-domain socket at + build time, but it learned to make the decision at runtime instead. + Will merge to 'next'. + 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/reftable-write-optim (2024-04-03) 11 commits + - reftable/block: reuse compressed array + - reftable/block: reuse zstream when writing log blocks + - reftable/writer: reset `last_key` instead of releasing it + - reftable/writer: unify releasing memory + - reftable/writer: refactorings for `writer_flush_nonempty_block()` + - reftable/writer: refactorings for `writer_add_record()` + - refs/reftable: don't recompute committer ident + - reftable: remove name checks + - refs/reftable: skip duplicate name checks + - refs/reftable: perform explicit D/F check when writing symrefs + - refs/reftable: fix D/F conflict error message on ref copy + Code to write out reftable has seen some optimization and + simplification. -* 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" + Expecting a reroll. + cf. + source: - 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> +* ds/send-email-per-message-block (2024-04-05) 2 commits + - SQUASH??? switch to separator semantics + - send-email: make it easy to discern the messages for each patch -* 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 + "git send-email" learned to separate its reports on each message it + sends out with an extra blank line in between. - 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> + Expecting a reroll. + cf. <8d47bd687f2ad80bbc1e1c86ae337327@manjaro.org> + source: <0e087ed992def0746f3d437253248904c2126464.1712262791.git.dsimic@manjaro.org> -* 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 +* ds/fetch-config-parse-microfix (2024-04-05) 1 commit + - fetch: return when parsing submodule.recurse - Fix the way recently added tests interpolate variables defined - outside them, and document the best practice to help future - developers. - source: + A config parser callback function fell through instead of returning + after recognising and processing a variable, wasting cycles, which + has been corrected. + Will merge to 'next'. + 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=