From: Junio C Hamano Date: Fri, 15 Mar 2024 23:31:56 +0000 (-0700) Subject: What's cooking (2024/03 #04) X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=42910d7ec9111b56e3768b3a2425fcda93da76da;p=thirdparty%2Fgit.git What's cooking (2024/03 #04) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index ad5d5f3caa..a9de75bbd3 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 (Mar 2024, #03; Mon, 11) -X-master-at: 945115026aa63df4ab849ab14a04da31623abece -X-next-at: 1203cff8ae1e19af27c286764313c3e3f54ef01e +Subject: What's cooking in git.git (Mar 2024, #04; Fri, 15) +X-master-at: 2953d95d402b6bff1a59c4712f4d46f1b9ea137f +X-next-at: cdc2e80fe5f5dd8f872f21cdcd608126da6ccc7e Bcc: lwn@lwn.net, gitster@pobox.com -What's cooking in git.git (Mar 2024, #03; Mon, 11) +What's cooking in git.git (Mar 2024, #04; Fri, 15) -------------------------------------------------- Here are the topics that have been cooking in my tree. Commits @@ -17,8 +17,6 @@ topic without enough support may be discarded after a long period of no activity (of course they can be resubmit when new interests arise). -The 'maint' branch now points at the 2.44 maintenance track. - 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. @@ -50,80 +48,367 @@ Release tarballs are available at: -------------------------------------------------- [Graduated to 'master'] -* es/config-doc-sort-sections (2024-02-29) 1 commit - (merged to 'next' on 2024-03-04 at 0752144ed7) - + docs: sort configuration variable groupings alphabetically +* ag/t0010-modernize (2024-03-05) 1 commit + (merged to 'next' on 2024-03-07 at 38339abc2d) + + tests: modernize the test script t0010-racy-git.sh + + GSoC practice to modernize a test script. + source: + + +* as/option-names-in-messages (2024-03-05) 4 commits + (merged to 'next' on 2024-03-07 at 73ab51faba) + + revision.c: trivial fix to message + + builtin/clone.c: trivial fix of message + + builtin/remote.c: trivial fix of error message + + transport-helper.c: trivial fix of error message + + Error message updates. + source: <20240216101647.28837-1-ash@kambanaria.org> + + +* gt/core-bare-in-templates (2024-03-04) 1 commit + (merged to 'next' on 2024-03-06 at e54ac5acf9) + + setup: remove unnecessary variable + + Code simplification. + source: <20240304151811.511780-1-shyamthakkar001@gmail.com> + + +* hd/config-mak-os390 (2024-03-06) 1 commit + (merged to 'next' on 2024-03-07 at 289d3ab691) + + build: support z/OS (OS/390). + + Platform specific tweaks for OS/390 has been added to + config.mak.uname. + source: + + +* jc/test-i18ngrep (2024-03-02) 1 commit + (merged to 'next' on 2024-03-06 at 2c57ebc706) + + test_i18ngrep: hard deprecate and forbid its use + + With release 2.44 we got rid of all uses of test_i18ngrep and there + is no in-flight topic that adds a new use of it. Make a call to + test_i18ngrep a hard failure, so that we can remove it at the end + of this release cycle. + source: + + +* jc/xwrite-cleanup (2024-03-02) 3 commits + (merged to 'next' on 2024-03-07 at 43e66f7e4d) + + repack: check error writing to pack-objects subprocess + + sideband: avoid short write(2) + + unpack: replace xwrite() loop with write_in_full() + + Uses of xwrite() helper have been audited and updated for better + error checking and simpler code. + source: <20240302190348.3946569-1-gitster@pobox.com> + + +* jh/fsmonitor-icase-corner-case-fix (2024-03-06) 14 commits + (merged to 'next' on 2024-03-06 at 356eafea7e) + + fsmonitor: support case-insensitive events + + fsmonitor: refactor bit invalidation in refresh callback + + fsmonitor: trace the new invalidated cache-entry count + + fsmonitor: return invalidated cache-entry count on non-directory event + + fsmonitor: remove custom loop from non-directory path handler + + fsmonitor: return invalidated cache-entry count on directory event + + fsmonitor: move untracked-cache invalidation into helper functions + + fsmonitor: refactor untracked-cache invalidation + + dir: create untracked_cache_invalidate_trimmed_path() + + fsmonitor: refactor refresh callback for non-directory events + + fsmonitor: clarify handling of directory events in callback helper + + fsmonitor: refactor refresh callback on directory events + + t7527: add case-insensitve test for FSMonitor + + name-hash: add index_dir_find() + + FSMonitor client code was confused when FSEvents were given in a + different case on a case-insensitive filesystem, which has been + corrected. + + Acked-by: Patrick Steinhardt + cf. + source: + + +* kh/branch-ref-syntax-advice (2024-03-05) 5 commits + (merged to 'next' on 2024-03-07 at 914f01967b) + + branch: advise about ref syntax rules + + advice: use double quotes for regular quoting + + advice: use backticks for verbatim + + advice: make all entries stylistically consistent + + t3200: improve test style + + When git refuses to create a branch because the proposed branch + name is not a valid refname, an advice message is given to refer + the user to exact naming rules. + source: + + +* kh/doc-commentchar-is-a-byte (2024-03-05) 1 commit + (merged to 'next' on 2024-03-06 at 5941655c04) + + config: document `core.commentChar` as ASCII-only + + The "core.commentChar" configuration variable only allows an ASCII + character, which was not clearly documented, which has been + corrected. + source: <9633f9be5ddd9ab3df4b79ee934e1ed47e90bd1d.1709656683.git.code@khaugsbakk.name> + + +* la/trailer-api (2024-03-01) 9 commits + (merged to 'next' on 2024-03-06 at f119923ff6) + + format_trailers_from_commit(): indirectly call trailer_info_get() + + format_trailer_info(): move "fast path" to caller + + format_trailers(): use strbuf instead of FILE + + trailer_info_get(): reorder parameters + + trailer: move interpret_trailers() to interpret-trailers.c + + trailer: reorder format_trailers_from_commit() parameters + + trailer: rename functions to use 'trailer' + + shortlog: add test for de-duplicating folded trailers + + trailer: free trailer_info _after_ all related usage + + Trailer API updates. + + Acked-by: Christian Couder + cf. + source: - Doc updates. - source: <20240229190229.20222-1-ericsunshine@charter.net> +* ps/reftable-iteration-perf-part2 (2024-03-04) 13 commits + (merged to 'next' on 2024-03-06 at e8ba314585) + + refs/reftable: precompute prefix length + + reftable: allow inlining of a few functions + + reftable/record: decode keys in place + + reftable/record: reuse refname when copying + + reftable/record: reuse refname when decoding + + reftable/merged: avoid duplicate pqueue emptiness check + + reftable/merged: circumvent pqueue with single subiter + + reftable/merged: handle subiter cleanup on close only + + reftable/merged: remove unnecessary null check for subiters + + reftable/merged: make subiters own their records + + reftable/merged: advance subiter on subsequent iteration + + reftable/merged: make `merged_iter` structure private + + reftable/pq: use `size_t` to track iterator index + (this branch is used by ps/reftable-reflog-iteration-perf.) -* js/merge-base-with-missing-commit (2024-03-09) 13 commits - (merged to 'next' on 2024-03-09 at caa7a7baaa) - + merge-ort/merge-recursive: do report errors in `merge_submodule()` - + merge-recursive: prepare for `merge_submodule()` to report errors - (merged to 'next' on 2024-03-01 at 3e3eabaee9) - + commit-reach(repo_get_merge_bases_many_dirty): pass on errors - + commit-reach(repo_get_merge_bases_many): pass on "missing commits" errors - + commit-reach(get_octopus_merge_bases): pass on "missing commits" errors - + commit-reach(repo_get_merge_bases): pass on "missing commits" errors - + commit-reach(get_merge_bases_many_0): pass on "missing commits" errors - + commit-reach(merge_bases_many): pass on "missing commits" errors - + commit-reach(paint_down_to_common): start reporting errors - + commit-reach(paint_down_to_common): prepare for handling shallow commits - + commit-reach(repo_in_merge_bases_many): report missing commits - + commit-reach(repo_in_merge_bases_many): optionally expect missing commits - + commit-reach(paint_down_to_common): plug two memory leaks + The code to iterate over refs with the reftable backend has seen + some optimization. + source: - Originally merged to 'next' on 2024-02-29 - Make sure failure return from merge_bases_many() is properly caught. - source: - source: +* rj/complete-reflog (2024-03-03) 5 commits + (merged to 'next' on 2024-03-06 at 0f1a25debc) + + completion: reflog subcommands and options + + completion: factor out __git_resolve_builtins + + completion: introduce __git_find_subcommand + + completion: reflog show + + completion: reflog with implicit "show" + + The command line completion script (in contrib/) learned to + complete "git reflog" better. + source: -* kh/doc-dashed-commands-have-not-worked-for-a-long-time (2024-03-01) 1 commit - (merged to 'next' on 2024-03-04 at 7e070c67f9) - + gitcli: drop mention of “non-dashed form” +* rj/complete-worktree-paths-fix (2024-02-27) 1 commit + (merged to 'next' on 2024-03-06 at b6ba949383) + + completion: fix __git_complete_worktree_paths - Doc update. - source: <5b34bc4e22816f7f19bd26c15a08fe4c749b72f8.1709316230.git.code@khaugsbakk.name> + The logic to complete the command line arguments to "git worktree" + subcommand (in contrib/) has been updated to correctly honor things + like "git -C dir" etc. + source: -* rs/t-ctype-simplify (2024-03-03) 4 commits - (merged to 'next' on 2024-03-04 at 9bd84a8877) - + t-ctype: avoid duplicating class names - + t-ctype: align output of i - + t-ctype: simplify EOF check - + t-ctype: allow NUL anywhere in the specification string +* so/clean-dry-run-without-force (2024-03-04) 2 commits + (merged to 'next' on 2024-03-06 at ccf2e123be) + + clean: further clean-up of implementation around "--force" + + clean: improve -n and -f implementation and documentation - Code simplification to one unit-test program. - source: <20240303101330.20187-1-l.s.r@web.de> + The implementation in "git clean" that makes "-n" and "-i" ignore + clean.requireForce has been simplified, together with the + documentation. + source: <87le6ziqzb.fsf_-_@osv.gnss.ru> + source: <20240303220600.2491792-1-gitster@pobox.com> -* sj/t9117-path-is-file (2024-03-04) 1 commit - (merged to 'next' on 2024-03-04 at de5f6a74cb) - + t9117: prefer test_path_* helper functions +* vm/t7301-use-test-path-helpers (2024-03-06) 1 commit + (merged to 'next' on 2024-03-07 at e638654635) + + t7301: use test_path_is_(missing|file) GSoC practice to replace "test -f" with "test_path_is_file". - source: <20240304095436.56399-2-shejialuo@gmail.com> + source: <20240304171732.64457-2-vincenzo.mezzela@gmail.com> -------------------------------------------------- [New Topics] +* bb/iso-strict-utc (2024-03-13) 1 commit + (merged to 'next' on 2024-03-14 at d2ac616873) + + date: make "iso-strict" conforming for the UTC timezone + + The output format for dates "iso-strict" has been tweaked to show + a time in the Zulu timezone with "Z" suffix, instead of "+00:00". + + Will merge to 'master'. + source: <20240313225423.11373-1-dev+git@drbeat.li> + + +* dg/user-manual-hash-example (2024-03-12) 1 commit + (merged to 'next' on 2024-03-14 at 767800d3a7) + + Documentation/user-manual.txt: example for generating object hashes + + User manual (the original one) update. + + Will merge to 'master'. + source: <20240312104238.4920-2-dirk@gouders.net> + + +* jc/show-untracked-false (2024-03-13) 2 commits + - 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 'next'? + source: <20240313173214.962532-1-gitster@pobox.com> + + +* js/bugreport-no-suffix-fix (2024-03-14) 1 commit + - 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. + + Will merge to 'next'? + source: <9c6f3f5203ae26c501a5711e2610573130bfd550.1710388817.git.gitgitgadget@gmail.com> + + +* jw/doc-show-untracked-files-fix (2024-03-13) 1 commit + (merged to 'next' on 2024-03-14 at 091f64ad6c) + + doc: status.showUntrackedFiles does not take "false" + + The status.showUntrackedFiles configuration variable was + incorrectly documented to accept "false", which has been corrected. + + Will merge to 'master'. + source: + + +* ph/diff-src-dst-prefix-config (2024-03-15) 1 commit + - diff: add diff.srcPrefix and diff.dstPrefix configuration variables + + "git diff" and friends learned two extra configuration variables. + + What's the status of this thing? + source: <20240315010310.GA1901653@quokka> + + +* ps/clone-with-includeif-onbranch (2024-03-12) 1 commit + - t5601: exercise clones with "includeIf.*.onbranch" + + An additional test to demonstrate something I am not sure what. + + Waiting for a review response. + cf. + source: <0bede59a53862585c49bc635f82e44e983144a7f.1710246859.git.ps@pks.im> + + +* bb/t0006-negative-tz-offset (2024-03-14) 1 commit + (merged to 'next' on 2024-03-14 at 3f4751b6b2) + + t0006: add more tests with a negative TZ offset + + More tests on showing time with negative TZ offset. + + Will merge to 'master'. + source: <20240314085512.1827031-1-dev+git@drbeat.li> + + +* 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. + + Will merge to 'master'. + source: <64c1c3cc-51d7-4168-9731-4389889e1449@gmail.com> + + +* bt/fuzz-config-parse (2024-03-15) 1 commit + - fuzz: add fuzzer for config parsing + + A new fuzz target that exercises config parsing code. + + Will merge to 'next'? + 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> + + +* jc/index-pack-fsck-levels (2024-03-15) 1 commit + - t5300: fix test_with_bad_commit() + + Test fix. + + Will merge to 'next'. + source: + + +* 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 + + 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: + +-------------------------------------------------- +[Cooking] + * jc/safe-implicit-bare (2024-03-11) 1 commit - - setup: notice more types of implicit bare repositories + (merged to 'next' on 2024-03-14 at e8bdbed1a4) + + setup: notice more types of implicit bare repositories Users with safe.bareRepository=explicit can still work from within $GIT_DIR of a seconary worktree (which resides at .git/worktrees/$name/) of the primary worktree without explicitly specifying the $GIT_DIR environment variable or the --git-dir= option. - Will merge to 'next'. + Will merge to 'master'. source: -* pw/checkout-conflict-errorfix (2024-03-08) 4 commits +* pw/checkout-conflict-errorfix (2024-03-14) 5 commits + - checkout: fix interaction between --conflict and --merge - checkout: cleanup --conflict=