From: Junio C Hamano Date: Fri, 9 Sep 2022 22:08:09 +0000 (-0700) Subject: What's cooking (2022/09 #02) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0597dcb96f9ee4af0b1c34965f0b3fea3ba0a90;p=thirdparty%2Fgit.git What's cooking (2022/09 #02) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index 10bc5806a4..da04c7d05d 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,9 +1,9 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (Sep 2022, #01; Mon, 5) -X-master-at: 79f2338b3746d23454308648b2491e5beba4beff -X-next-at: 6a6ce2da067c0f93245427725e5f14352452ea04 +Subject: What's cooking in git.git (Sep 2022, #02; Fri, 9) +X-master-at: dd3f6c4cae7e3b15ce984dce8593ff7569650e24 +X-next-at: 50f0e44ec40b5fab5d618dd26ebd776c47e9af13 -What's cooking in git.git (Sep 2022, #01; Mon, 5) +What's cooking in git.git (Sep 2022, #02; Fri, 9) -------------------------------------------------- Here are the topics that have been cooking in my tree. Commits @@ -13,10 +13,11 @@ release). Commits prefixed with '-' are only in 'seen', and aren't considered "accepted" at all. A topic without enough support may be discarded after a long period of no activity. -We just started week #9 in a 12-week cycle toward Git 2.38 -(tinyurl.com/gitCal), but since Monday was a holiday in US, we may -see only four days worth of new patches, which is less work for our -reviewers pool ;-) +We are at the end of week #9 in a 12-week cycle toward Git 2.38 +(tinyurl.com/gitCal). I plan to tag -rc0 (i.e. preview) on the 15th +or so, but I expect that many folks are busy in Chicago for Git Merge +so let's not make a big fuss about it and instead treat it as just one +of the regular updates to the 'master' branch. 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 @@ -49,175 +50,216 @@ Release tarballs are available at: -------------------------------------------------- [Graduated to 'master'] -* ac/bitmap-lookup-table (2022-08-28) 7 commits - (merged to 'next' on 2022-08-29 at 05d2d2c8bd) - + pack-bitmap-write: drop unused pack_idx_entry parameters - (merged to 'next' on 2022-08-26 at 7914c141eb) - + bitmap-lookup-table: add performance tests for lookup table - + pack-bitmap: prepare to read lookup table extension - + pack-bitmap-write: learn pack.writeBitmapLookupTable and add tests - + pack-bitmap-write.c: write lookup table extension - + bitmap: move `get commit positions` code to `bitmap_writer_finish` - + Documentation/technical: describe bitmap lookup table extension +* ab/retire-ppc-sha1 (2022-08-31) 2 commits + (merged to 'next' on 2022-09-05 at 480da6ef06) + + Makefile: use $(OBJECTS) instead of $(C_OBJ) + + Makefile + hash.h: remove PPC_SHA1 implementation + + Remove the assembly version of SHA-1 implementation for PPC. + source: - The pack bitmap file gained a bitmap-lookup table to speed up - locating the necessary bitmap for a given commit. - source: +* cc/doc-trailer-whitespace-rules (2022-08-30) 1 commit + (merged to 'next' on 2022-09-05 at 4c018a3ab7) + + Documentation: clarify whitespace rules for trailers + + Doc update. + source: <20220830105046.324041-1-christian.couder@gmail.com> -* bc/gc-crontab-fix (2022-08-28) 1 commit - (merged to 'next' on 2022-08-30 at a7a240a4da) - + gc: use temporary file for editing crontab - (this branch is used by jk/test-crontab-fixes.) - FreeBSD portability fix for "git maintenance" that spawns "crontab" - to schedule tasks. - source: <20220828214143.754759-1-sandals@crustytoothpaste.net> +* jc/format-patch-force-in-body-from (2022-08-29) 3 commits + (merged to 'next' on 2022-09-05 at cecaaad60e) + + format-patch: learn format.forceInBodyFrom configuration variable + + format-patch: allow forcing the use of in-body From: header + + pretty: separate out the logic to decide the use of in-body from + + "git format-patch --from=" can be told to add an in-body + "From:" line even for commits that are authored by the given + with "--force-in-body-from"option. + source: <20220829213837.13849-1-gitster@pobox.com> + + +* jk/tempfile-active-flag-cleanup (2022-08-30) 3 commits + (merged to 'next' on 2022-09-05 at 43ed4656b3) + + tempfile: update comment describing state transitions + + tempfile: drop active flag + + Merge branch 'rs/tempfile-cleanup-race-fix' into jk/tempfile-active-flag-cleanup + Code clean-up. + source: -* ds/bundle-uri-clone (2022-08-24) 6 commits - (merged to 'next' on 2022-08-25 at 14754922fa) - + clone: warn on failure to repo_init() - (merged to 'next' on 2022-08-18 at 5e8a3ec71e) - + clone: --bundle-uri cannot be combined with --depth - + bundle-uri: add support for http(s):// and file:// - + clone: add --bundle-uri option - + bundle-uri: create basic file-copy logic - + remote-curl: add 'get' capability - (this branch is used by ds/bundle-uri-3.) - Implement "git clone --bundle-uri". - source: - source: <5229519b-3af2-a023-8996-43343b130722@github.com> - - -* en/merge-multi-strategies (2022-08-24) 2 commits - (merged to 'next' on 2022-08-25 at 420e2eae66) - + merge: small code readability improvement - + merge: cleanup confusing logic for handling successful merges - - The code that implements multi-strategy support in "git merge" has - been clean-up a bit. - source: - - -* en/merge-unstash-only-on-clean-merge (2022-08-24) 1 commit - (merged to 'next' on 2022-08-25 at a144bdf6cb) - + merge: only apply autostash when appropriate - - The auto-stashed local changes created by "git merge --autostash" - was mixed into a conflicted state left in the working tree, which - has been corrected. - source: <610b8d089db97bf1a37dbf230f51ecafe3086254.1661222541.git.gitgitgadget@gmail.com> - - -* en/t4301-more-merge-tree-tests (2022-08-24) 1 commit - (merged to 'next' on 2022-08-25 at c7abf60ff4) - + t4301: add more interesting merge-tree testcases - (this branch is used by es/t4301-sed-portability-fix.) - - More tests to protect the current behaviour of "merge-tree" before - it gets further updated. - source: - - -* en/test-without-test-create-repo (2022-08-26) 1 commit - (merged to 'next' on 2022-08-30 at 4f80f48e27) - + t64xx: convert 'test_create_repo' to 'git init' - - Test clean-up. - source: - - -* es/t4301-sed-portability-fix (2022-08-29) 4 commits - (merged to 'next' on 2022-08-30 at eec0ceef0a) - + t4301: emit blank line in more idiomatic fashion - + t4301: fix broken &&-chains and add missing loop termination - + t4301: account for behavior differences between sed implementations - + Merge branch 'en/t4301-more-merge-tree-tests' into es/t4301-sed-portability-fix - - Test clean-up. - source: - - -* jk/test-crontab-fixes (2022-08-30) 1 commit - (merged to 'next' on 2022-09-02 at d5113b5be3) - + test-crontab: minor memory and error handling fixes - (this branch uses bc/gc-crontab-fix.) - - Test helper fix. - source: <20220823010120.25388-1-sandals@crustytoothpaste.net> - - -* rs/tempfile-cleanup-race-fix (2022-08-27) 1 commit - (merged to 'next' on 2022-08-30 at 158dd1c910) - + tempfile: avoid directory cleanup race - (this branch is used by jk/tempfile-active-flag-cleanup.) - - The clean-up of temporary files created via mks_tempfile_dt() was - racy and attempted to unlink() the leading directory when signals - are involved, which has been corrected. - source: <526a174e-b179-c284-a21c-7afe0a0b4df2@web.de> +* js/add-p-diff-parsing-fix (2022-09-01) 3 commits + (merged to 'next' on 2022-09-02 at 1545e0898d) + + add -p: ignore dirty submodules + + add -p: gracefully handle unparseable hunk headers in colored diffs + + add -p: detect more mismatches between plain vs colored diffs + Those who use diff-so-fancy as the diff-filter noticed a regression + or two in the code that parses the diff output in the built-in + version of "add -p", which has been corrected. + source: -* rs/test-mergesort (2022-08-28) 2 commits - (merged to 'next' on 2022-08-30 at 4905149886) - + test-mergesort: use mem_pool for sort input - + test-mergesort: read sort input all at once - - Optimization of a test-helper command. - source: <128f0fb8-d29b-8622-0cfe-2ecadc999db5@web.de> +* js/range-diff-with-pathspec (2022-08-26) 3 commits + (merged to 'next' on 2022-09-05 at c027222552) + + range-diff: optionally accept pathspecs + + range-diff: consistently validate the arguments + + range-diff: reorder argument handling -* sg/parse-options-subcommand (2022-08-25) 23 commits - (merged to 'next' on 2022-08-25 at dab6bf1439) - + remote: run "remote rm" argv through parse_options() - + maintenance: add parse-options boilerplate for subcommands - + pass subcommand "prefix" arguments to parse_options() - (merged to 'next' on 2022-08-22 at 09d07c2271) - + builtin/worktree.c: let parse-options parse subcommands - + builtin/stash.c: let parse-options parse subcommands - + builtin/sparse-checkout.c: let parse-options parse subcommands - + builtin/remote.c: let parse-options parse subcommands - + builtin/reflog.c: let parse-options parse subcommands - + builtin/notes.c: let parse-options parse subcommands - + builtin/multi-pack-index.c: let parse-options parse subcommands - + builtin/hook.c: let parse-options parse subcommands - + builtin/gc.c: let parse-options parse 'git maintenance's subcommands - + builtin/commit-graph.c: let parse-options parse subcommands - + builtin/bundle.c: let parse-options parse subcommands - + parse-options: add support for parsing subcommands - + parse-options: drop leading space from '--git-completion-helper' output - + parse-options: clarify the limitations of PARSE_OPT_NODASH - + parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --options - + api-parse-options.txt: fix description of OPT_CMDMODE - + t0040-parse-options: test parse_options() with various 'parse_opt_flags' - + t5505-remote.sh: check the behavior without a subcommand - + t3301-notes.sh: check that default operation mode doesn't take arguments - + git.c: update NO_PARSEOPT markings - (this branch is used by js/bisect-in-c.) + Allow passing a pathspec to "git range-diff". + source: - Introduce the "subcommand" mode to parse-options API and update the - command line parser of Git commands with subcommands. - source: <20220819160411.1791200-1-szeder.dev@gmail.com> - source: - - -* tb/midx-with-changing-preferred-pack-fix (2022-08-22) 7 commits - (merged to 'next' on 2022-08-26 at 305a9d3323) - + midx.c: avoid adding preferred objects twice - + midx.c: include preferred pack correctly with existing MIDX - + midx.c: extract `midx_fanout_add_pack_fanout()` - + midx.c: extract `midx_fanout_add_midx_fanout()` - + midx.c: extract `struct midx_fanout` - + t/lib-bitmap.sh: avoid silencing stderr - + t5326: demonstrate potential bitmap corruption - - Multi-pack index got corrupted when preferred pack changed from one - pack to another in a certain way, which has been corrected. - source: +* vd/sparse-reset-checkout-fixes (2022-09-02) 1 commit + (merged to 'next' on 2022-09-05 at 8c59ace003) + + unpack-trees: fix sparse directory recursion check + Segfault fix-up to an earlier fix to the topic to teach "git reset" + and "git checkout" work better in a sparse checkout. + source: + +-------------------------------------------------- +[New Topics] + +* ab/doc-synopsis-and-cmd-usage (2022-09-07) 34 commits + - tests: start asserting that *.txt SYNOPSIS matches -h output + - doc txt & -h consistency: make "worktree" consistent + - worktree: define subcommand -h in terms of command -h + - reflog doc: list real subcommands up-front + - doc txt & -h consistency: make "commit" consistent + - doc txt & -h consistency: make "diff-tree" consistent + - doc txt & -h consistency: use "[