From: Junio C Hamano Date: Mon, 11 Mar 2024 22:39:19 +0000 (-0700) Subject: What's cooking (2024/03 #03) X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=74c44febb4006de36ad47e582156fe6e28fcb93d;p=thirdparty%2Fgit.git What's cooking (2024/03 #03) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index b3895b182e..ad5d5f3caa 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, #02; Thu, 7) -X-master-at: e09f1254c54329773904fe25d7c545a1fb4fa920 -X-next-at: c1ea87d7ee147b4fd526f238b8e20889c532d10d +Subject: What's cooking in git.git (Mar 2024, #03; Mon, 11) +X-master-at: 945115026aa63df4ab849ab14a04da31623abece +X-next-at: 1203cff8ae1e19af27c286764313c3e3f54ef01e Bcc: lwn@lwn.net, gitster@pobox.com -What's cooking in git.git (Mar 2024, #02; Thu, 7) +What's cooking in git.git (Mar 2024, #03; Mon, 11) -------------------------------------------------- Here are the topics that have been cooking in my tree. Commits @@ -50,291 +50,137 @@ Release tarballs are available at: -------------------------------------------------- [Graduated to 'master'] -* ak/rebase-autosquash (2024-02-27) 1 commit - (merged to 'next' on 2024-03-01 at 57a34830b7) - + rebase: fix typo in autosquash documentation - - Originally merged to 'next' on 2024-02-27 - - Typofix. - source: - - -* cc/rev-list-allow-missing-tips (2024-02-28) 5 commits - (merged to 'next' on 2024-03-01 at fd7b109d04) - + revision: fix --missing=[print|allow*] for annotated tags - (merged to 'next' on 2024-03-01 at ac0fc94378) - + rev-list: allow missing tips with --missing=[print|allow*] - + t6022: fix 'test' style and 'even though' typo - + oidset: refactor oidset_insert_from_set() - + revision: clarify a 'return NULL' in get_reference() - - Originally merged to 'next' on 2024-02-28 - - "git rev-list --missing=print" has learned to optionally take - "--allow-missing-tips", which allows the objects at the starting - points to be missing. - source: <20240214142513.4002639-1-christian.couder@gmail.com> - - -* eg/add-uflags (2024-02-29) 1 commit - (merged to 'next' on 2024-03-01 at 5dbc997561) - + add: use unsigned type for collection of bits - - Originally merged to 'next' on 2024-02-29 - - Code clean-up practice. - source: <20240229194444.8499-2-giganteeugenio2@gmail.com> - - -* jc/doc-compat-util (2024-02-27) 1 commit - (merged to 'next' on 2024-03-01 at 89b76c65d7) - + doc: clarify the wording on requirement - - Originally merged to 'next' on 2024-02-27 - - Clarify wording in the CodingGuidelines that requires - to be the first header file. - source: - - -* jc/no-include-of-compat-util-from-headers (2024-02-24) 1 commit - (merged to 'next' on 2024-03-01 at ebb921087e) - + compat: drop inclusion of - - Originally merged to 'next' on 2024-02-26 - - Header file clean-up. - source: - - -* jc/no-lazy-fetch (2024-02-27) 3 commits - (merged to 'next' on 2024-03-01 at 14303cdbfe) - + git: extend --no-lazy-fetch to work across subprocesses - + git: document GIT_NO_REPLACE_OBJECTS environment variable - + git: --no-lazy-fetch option - - Originally merged to 'next' on 2024-02-29 - - "git --no-lazy-fetch cmd" allows to run "cmd" while disabling lazy - fetching of objects from the promisor remote, which may be handy - for debugging. - source: - source: - source: - - -* jk/reflog-special-cases-fix (2024-02-26) 3 commits - (merged to 'next' on 2024-03-01 at 2b67f6e668) - + read_ref_at(): special-case ref@{0} for an empty reflog - + get_oid_basic(): special-case ref@{n} for oldest reflog entry - + Revert "refs: allow @{n} to work with n-sized reflog" - - Originally merged to 'next' on 2024-02-27 - - The logic to access reflog entries by date and number had ugly - corner cases at the boundaries, which have been cleaned up. - source: <20240226100010.GA1214708@coredump.intra.peff.net> - - -* jk/textconv-cache-outside-repo-fix (2024-02-26) 1 commit - (merged to 'next' on 2024-03-01 at 8508b83758) - + userdiff: skip textconv caching when not in a repository - - Originally merged to 'next' on 2024-02-26 - - The code incorrectly attempted to use textconv cache when asked, - even when we are not running in a repository, which has been - corrected. - source: <20240226102729.GB2685773@coredump.intra.peff.net> - - -* jk/upload-pack-bounded-resources (2024-02-28) 9 commits - (merged to 'next' on 2024-03-01 at b70b6f0913) - + upload-pack: free tree buffers after parsing - + upload-pack: use PARSE_OBJECT_SKIP_HASH_CHECK in more places - + upload-pack: always turn off save_commit_buffer - + upload-pack: disallow object-info capability by default - + upload-pack: accept only a single packfile-uri line - + upload-pack: use a strmap for want-ref lines - + upload-pack: use oidset for deepen_not list - + upload-pack: switch deepen-not list to an oid_array - + upload-pack: drop separate v2 "haves" array - - Originally merged to 'next' on 2024-02-29 - - Various parts of upload-pack has been updated to bound the resource - consumption relative to the size of the repository to protect from - abusive clients. - source: <20240228223700.GA1157826@coredump.intra.peff.net> - - -* jk/upload-pack-v2-capability-cleanup (2024-02-29) 4 commits - (merged to 'next' on 2024-03-01 at 2750893db7) - + upload-pack: only accept packfile-uris if we advertised it - + upload-pack: use existing config mechanism for advertisement - + upload-pack: centralize setup of sideband-all config - + upload-pack: use repository struct to get config - - Originally merged to 'next' on 2024-02-29 - - The upload-pack program, when talking over v2, accepted the - packfile-uris protocol extension from the client, even if it did - not advertise the capability, which has been corrected. - source: <20240228224625.GA1158651@coredump.intra.peff.net> - - -* js/merge-tree-3-trees (2024-02-23) 7 commits - (merged to 'next' on 2024-03-01 at a75dc95f04) - + fill_tree_descriptor(): mark error message for translation - + cache-tree: avoid an unnecessary check - + Always check `parse_tree*()`'s return value - + t4301: verify that merge-tree fails on missing blob objects - + merge-ort: do check `parse_tree()`'s return value - + merge-tree: fail with a non-zero exit code on missing tree objects - + merge-tree: accept 3 trees as arguments - - Originally merged to 'next' on 2024-02-28 - - "git merge-tree" has learned that the three trees involved in the - 3-way merge only need to be trees, not necessarily commits. - source: - source: - - -* js/remove-cruft-files (2024-02-26) 1 commit - (merged to 'next' on 2024-03-01 at 63100a274b) - + neue: remove a bogus empty file - - Originally merged to 'next' on 2024-02-26 +* 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 - Remove an empty file that shouldn't have been added in the first - place. - source: + Doc updates. + source: <20240229190229.20222-1-ericsunshine@charter.net> -* jt/commit-redundant-scissors-fix (2024-02-27) 2 commits - (merged to 'next' on 2024-03-01 at e5983498f1) - + commit: unify logic to avoid multiple scissors lines when merging - + commit: avoid redundant scissor line with --cleanup=scissors -v +* 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 - "git commit -v --cleanup=scissors" used to add the scissors line - twice in the log message buffer, which has been corrected. - source: - - -* kn/for-all-refs (2024-02-23) 6 commits - (merged to 'next' on 2024-03-01 at 76a1297ace) - + for-each-ref: add new option to include root refs - + ref-filter: rename 'FILTER_REFS_ALL' to 'FILTER_REFS_REGULAR' - + refs: introduce `refs_for_each_include_root_refs()` - + refs: extract out `loose_fill_ref_dir_regular_file()` - + refs: introduce `is_pseudoref()` and `is_headref()` - + Merge branch 'ps/reftable-backend' into kn/for-all-refs - - Originally merged to 'next' on 2024-02-27 - - "git for-each-ref" learned "--include-root-refs" option to show - even the stuff outside the 'refs/' hierarchy. - source: <20240223100112.44127-1-karthik.188@gmail.com> + Make sure failure return from merge_bases_many() is properly caught. + source: + source: -* ml/log-merge-with-cherry-pick-and-other-pseudo-heads (2024-02-28) 2 commits - (merged to 'next' on 2024-03-01 at 339111ec08) - + revision: implement `git log --merge` also for rebase/cherry-pick/revert - + revision: ensure MERGE_HEAD is a ref in prepare_show_merge +* 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” - Originally merged to 'next' on 2024-02-29 + Doc update. + source: <5b34bc4e22816f7f19bd26c15a08fe4c749b72f8.1709316230.git.code@khaugsbakk.name> - "git log --merge" learned to pay attention to CHERRY_PICK_HEAD and - other kinds of *_HEAD pseudorefs. - source: <20240228-ml-log-merge-with-cherry-pick-and-other-pseudo-heads-v6-0-8ec34c052b39@gmail.com> +* 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 -* pb/ort-make-submodule-conflict-message-an-advice (2024-02-26) 1 commit - (merged to 'next' on 2024-03-01 at df880cde2e) - + merge-ort: turn submodule conflict suggestions into an advice + Code simplification to one unit-test program. + source: <20240303101330.20187-1-l.s.r@web.de> - Originally merged to 'next' on 2024-02-27 - When a merge conflicted at a submodule, merge-ort backend used to - unconditionally give a lengthy message to suggest how to resolve - it. Now the message can be squelched as an advice message. - source: +* 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> -* ps/reftable-repo-init-fix (2024-02-27) 2 commits - (merged to 'next' on 2024-03-01 at abbf85051b) - + refs/reftable: don't fail empty transactions in repo without HEAD - + Merge branch 'ps/remote-helper-repo-initialization-fix' into ps/reftable-repo-init-fix - (this branch uses ps/remote-helper-repo-initialization-fix.) +-------------------------------------------------- +[New Topics] - Originally merged to 'next' on 2024-02-29 +* jc/safe-implicit-bare (2024-03-11) 1 commit + - setup: notice more types of implicit bare repositories - Clear the fallout from a fix for 2.44 regression. - source: <95be968e10bd02c64448786e690bbefe5c082577.1709041721.git.ps@pks.im> + 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: -* ps/remote-helper-repo-initialization-fix (2024-02-27) 1 commit - (merged to 'next' on 2024-03-01 at 7b79ffbd8f) - + builtin/clone: allow remote helpers to detect repo - (this branch is used by ps/reftable-repo-init-fix.) - Originally merged to 'next' on 2024-02-29 +* pw/checkout-conflict-errorfix (2024-03-08) 4 commits + - checkout: cleanup --conflict=