From: Junio C Hamano Date: Tue, 12 Mar 2024 00:45:16 GMT Subject: What's cooking in git.git (Mar 2024, #03; Mon, 11) Message-ID: 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). 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. 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'] * 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 Doc updates. source: <20240229190229.20222-1-ericsunshine@charter.net> * 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 Originally merged to 'next' on 2024-02-29 Make sure failure return from merge_bases_many() is properly caught. source: 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” Doc update. source: <5b34bc4e22816f7f19bd26c15a08fe4c749b72f8.1709316230.git.code@khaugsbakk.name> * 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 Code simplification to one unit-test program. source: <20240303101330.20187-1-l.s.r@web.de> * 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 GSoC practice to replace "test -f" with "test_path_is_file". source: <20240304095436.56399-2-shejialuo@gmail.com> -------------------------------------------------- [New Topics] * jc/safe-implicit-bare (2024-03-11) 1 commit - 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'. source: * pw/checkout-conflict-errorfix (2024-03-08) 4 commits - checkout: cleanup --conflict=