From c486f9e604c4c9e8f1dadcddeecd9430ef1f0fb5 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 27 Jul 2023 15:45:25 -0700 Subject: [PATCH] What's cooking (2023/07 #06) --- whats-cooking.txt | 708 +++++++++++++++++++--------------------------- 1 file changed, 296 insertions(+), 412 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index 7455f69a2e..256acd7b62 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 (Jul 2023, #05; Tue, 25) -X-master-at: a80be152923a46f04a06bade7bcc72870e46ca09 -X-next-at: 7dcf015ea4152b2113f79acb1e230aef744551f3 +Subject: What's cooking in git.git (Jul 2023, #06; Thu, 27) +X-master-at: bfce02c22f3f1b0539686cabb69a637854448be3 +X-next-at: a95def55d0faaf65aa3e0af7c4586ec520f28f9a Bcc: lwn@lwn.net, gitster@pobox.com -What's cooking in git.git (Jul 2023, #05; Tue, 25) +What's cooking in git.git (Jul 2023, #06; Thu, 27) -------------------------------------------------- Here are the topics that have been cooking in my tree. Commits @@ -48,293 +48,107 @@ Release tarballs are available at: -------------------------------------------------- [Graduated to 'master'] -* ah/advise-force-pushing (2023-07-13) 3 commits - (merged to 'next' on 2023-07-17 at b040e8280e) - + push: don't imply that integration is always required before pushing - + remote: don't imply that integration is always required before pushing - + wt-status: don't show divergence advice when committing +* jc/am-parseopt-fix (2023-07-18) 1 commit + (merged to 'next' on 2023-07-19 at eaf592531e) + + am: simplify parsing of "--[no-]keep-cr" - Help newbies by suggesting that there are cases where force-pushing - is a valid and sensible thing to update a branch at a remote - repository, rather than reconciling with merge/rebase. - source: <20230713044128.3771818-1-alexhenrie24@gmail.com> + Code simplification. + source: -* dk/bundle-i18n-more (2023-07-13) 1 commit - (merged to 'next' on 2023-07-18 at a9745efbe2) - + i18n: mark more bundle.c strings for translation +* jc/branch-parseopt-fix (2023-07-18) 1 commit + (merged to 'next' on 2023-07-19 at 738d25bbb6) + + branch: reject "--no-all" and "--no-remotes" early - Update message mark-up for i18n in "git bundle". - source: + Command line parser fixes. + source: -* dk/t4002-syntaxo-fix (2023-07-14) 1 commit - (merged to 'next' on 2023-07-17 at 75d729ee52) - + t4002: fix "diff can read from stdin" syntax +* jc/gitignore-doc-pattern-markup (2023-07-18) 1 commit + (merged to 'next' on 2023-07-20 at ecfc9c6118) + + gitignore.txt: mark up explanation of patterns consistently - Test fix. - source: + Doc mark-up update. + source: -* jk/nested-points-at (2023-07-17) 4 commits - (merged to 'next' on 2023-07-18 at cf33f44a50) - + ref-filter: simplify return type of match_points_at - + ref-filter: avoid parsing non-tags in match_points_at() - + ref-filter: avoid parsing tagged objects in match_points_at() - + ref-filter: handle nested tags in --points-at option +* jc/parse-options-reset (2023-07-19) 1 commit + (merged to 'next' on 2023-07-20 at d2178a4bd4) + + reset: reject --no-(mixed|soft|hard|merge|keep) option - "git tag --list --points-at X" showed tags that directly refers to - object X, but did not list a tag that points at such a tag, which - has been corrected. - source: <20230702223342.GA1598765@coredump.intra.peff.net> + Command line parser fix. + source: -* jk/unused-parameter (2023-07-13) 14 commits - (merged to 'next' on 2023-07-18 at 59d8f4ec1e) - + t/helper: mark unused callback void data parameters - + tag: mark unused parameters in each_tag_name_fn callbacks - + rev-parse: mark unused parameter in for_each_abbrev callback - + replace: mark unused parameter in each_mergetag_fn callback - + replace: mark unused parameter in ref callback - + merge-tree: mark unused parameter in traverse callback - + fsck: mark unused parameters in various fsck callbacks - + revisions: drop unused "opt" parameter in "tweak" callbacks - + count-objects: mark unused parameter in alternates callback - + am: mark unused keep_cr parameters - + http-push: mark unused parameter in xml callback - + http: mark unused parameters in curl callbacks - + do_for_each_ref_helper(): mark unused repository parameter - + test-ref-store: drop unimplemented reflog-expire command +* jc/parse-options-show-branch (2023-07-19) 2 commits + (merged to 'next' on 2023-07-20 at 4fa809c2f2) + + show-branch: reject --[no-](topo|date)-order + + show-branch: --no-sparse should give dense output - Mark-up unused parameters in the code so that we can eventually - enable -Wunused-parameter by default. - source: <20230703064347.GA3524892@coredump.intra.peff.net> + Command line parser fixes. + source: -* mh/mingw-case-sensitive-build (2023-06-12) 1 commit - (merged to 'next' on 2023-07-17 at 2c72856851) - + mingw: use lowercase includes for some Windows headers +* jc/transport-parseopt-fix (2023-07-18) 2 commits + (merged to 'next' on 2023-07-20 at 07f0026aaa) + + fetch: reject --no-ipv[46] + + parse-options: introduce OPT_IPVERSION() - Names of MinGW header files are spelled in mixed case in some - source files, but the build host can be using case sensitive - filesystem with header files with their name spelled in all - lowercase. - source: <20230604211934.1365289-1-mh@glandium.org> + Command line parser fixes. + source: -* rs/ref-filter-signature-fix (2023-07-17) 1 commit - (merged to 'next' on 2023-07-18 at e74f016a60) - + t6300: fix setup with GPGSSH but without GPG +* jr/gitignore-doc-example-markup (2023-07-18) 1 commit + (merged to 'next' on 2023-07-19 at 4f2ece568d) + + gitignore.txt: use backticks instead of double quotes - Test fix. - source: + Doc update. + source: -* rs/strbuf-addftime-simplify (2023-07-17) 1 commit - (merged to 'next' on 2023-07-18 at d665b0f0e9) - + strbuf: use skip_prefix() in strbuf_addftime() +* rs/ls-tree-no-full-name-fix (2023-07-18) 1 commit + (merged to 'next' on 2023-07-19 at 86e570c084) + + ls-tree: fix --no-full-name - Code clean-up. - source: - - -* tb/object-access-overflow-protection (2023-07-14) 20 commits - (merged to 'next' on 2023-07-17 at 9ad8a08011) - + commit-graph.c: prevent overflow in `verify_commit_graph()` - + commit-graph.c: prevent overflow in `write_commit_graph()` - + commit-graph.c: prevent overflow in `merge_commit_graph()` - + commit-graph.c: prevent overflow in `split_graph_merge_strategy()` - + commit-graph.c: prevent overflow in `load_tree_for_commit()` - + commit-graph.c: prevent overflow in `fill_commit_in_graph()` - + commit-graph.c: prevent overflow in `fill_commit_graph_info()` - + commit-graph.c: prevent overflow in `load_oid_from_graph()` - + commit-graph.c: prevent overflow in add_graph_to_chain() - + commit-graph.c: prevent overflow in `write_commit_graph_file()` - + pack-bitmap.c: ensure that eindex lookups don't overflow - + midx.c: prevent overflow in `fill_included_packs_batch()` - + midx.c: prevent overflow in `write_midx_internal()` - + midx.c: store `nr`, `alloc` variables as `size_t`'s - + midx.c: prevent overflow in `nth_midxed_offset()` - + midx.c: prevent overflow in `nth_midxed_object_oid()` - + midx.c: use `size_t`'s for fanout nr and alloc - + packfile.c: use checked arithmetic in `nth_packed_object_offset()` - + packfile.c: prevent overflow in `load_idx()` - + packfile.c: prevent overflow in `nth_packed_object_id()` - - Various offset computation in the code that accesses the packfiles - and other data in the object layer has been hardened against - arithmetic overflow, especially on 32-bit systems. - source: - source: - - -* tb/refs-exclusion-and-packed-refs (2023-07-10) 16 commits - (merged to 'next' on 2023-07-13 at 6d72f3e995) - + ls-refs.c: avoid enumerating hidden refs where possible - + upload-pack.c: avoid enumerating hidden refs where possible - + builtin/receive-pack.c: avoid enumerating hidden references - + refs.h: implement `hidden_refs_to_excludes()` - + refs.h: let `for_each_namespaced_ref()` take excluded patterns - + revision.h: store hidden refs in a `strvec` - + refs/packed-backend.c: add trace2 counters for jump list - + refs/packed-backend.c: implement jump lists to avoid excluded pattern(s) - + refs/packed-backend.c: refactor `find_reference_location()` - + refs: plumb `exclude_patterns` argument throughout - + builtin/for-each-ref.c: add `--exclude` option - + ref-filter.c: parameterize match functions over patterns - + ref-filter: add `ref_filter_clear()` - + ref-filter: clear reachable list pointers after freeing - + ref-filter.h: provide `REF_FILTER_INIT` - + refs.c: rename `ref_filter` - - Enumerating refs in the packed-refs file, while excluding refs that - match certain patterns, has been optimized. - source: + Command line parser fix. + source: -------------------------------------------------- [New Topics] -* ah/sequencer-rewrite-todo-fix (2023-07-24) 1 commit - - sequencer: finish parsing the todo list despite an invalid first line +* pv/doc-submodule-update-settings (2023-07-25) 1 commit + (merged to 'next' on 2023-07-27 at e27b5b7ba8) + + doc: highlight that .gitmodules does not support !command - When the user edits "rebase -i" todo file so that it starts with a - "fixup", which would make it invalid, the command truncated the - rest of the file before giving an error and returning the control - back to the user. Stop truncating to make it easier to correct - such a malformed todo file. - - Will merge to 'next'. - cf. - source: <20230722212830.132135-2-alexhenrie24@gmail.com> - - -* bb/trace2-comment-fix (2023-07-19) 1 commit - (merged to 'next' on 2023-07-21 at f77aeba1b5) - + trace2: fix a comment - - In-code comment fix. + Rewrite the description of giving a custom command to the + submodule..update configuraiton variable. Will merge to 'master'. - source: <20230719232444.555838-1-dev+git@drbeat.li> + source: <20230725212218.711116-1-pvutov@imap.cc> -* ks/ref-filter-describe (2023-07-24) 2 commits - - ref-filter: add new "describe" atom - - ref-filter: add multiple-option parsing functions +* la/doc-choose-starting-point-fixup (2023-07-27) 3 commits + - SubmittingPatches: use of older maintenance tracks is an exception + - SubmittingPatches: explain why 'next' and above are inappropriate base + - SubmittingPatches: choice of base for fixing an older maintenance track + (this branch uses la/doc-choose-starting-point.) - "git branch --list --format=" and friends are taught - a new "%(describe)" placeholder. + Clarify how to pick a starting point for a new topic in the + SubmittingPatches document. Will merge to 'next'. - source: <20230723162717.68123-1-five231003@gmail.com> + source: + source: -* bb/use-trace2-counters-for-fsync-stats (2023-07-20) 1 commit - - wrapper: use trace2 counters to collect fsync stats +* jc/resolve-undo-fixes (2023-07-27) 3 commits + - update-index: use unmerge_index_entry() to support removal + - resolve-undo: allow resurrecting conflicted state that resolved to deletion + - update-index: do not read HEAD and MERGE_HEAD unconditionally - Instead of inventing a custom counter variables for debugging, - use existing trace2 facility in the fsync customization codepath. + Assorted fixes and clean-up around resolve-undo data. - Will merge to 'next'. - source: <20230720164823.625815-1-dev+git@drbeat.li> - - -* am/doc-sha256 (2023-07-20) 1 commit - - doc: sha256 is no longer experimental - - Tone down the warning on SHA-256 repositories being an experimental - curiosity. We do not have support for them to interoperate with - traditional SHA-1 repositories, but at this point, we do not plan - to make breaking changes to SHA-256 repositories and there is no - longer need for such a strongly phrased warning. - - Review comments sent. - cf. - source: - - -* hy/blame-in-bare-with-contents (2023-07-21) 1 commit - - blame: allow --contents to work with bare repo - - "git blame --contents=file" has been taught to work in a bare - repository. - - Will merge to 'next'? - source: <20230721035758.61956-1-hanyang.tony@bytedance.com> - - -* ja/worktree-orphan-fix (2023-07-21) 4 commits - - SQUASH??? - - t2400: rewrite regex to avoid unintentional PCRE - - builtin/worktree.c: convert tab in advice to space - - t2400: drop no-op `--sq` from rev-parse call - - Expecting a reroll. - cf. - source: <20230721044012.24360-1-jacobabel@nullpo.dev> - - -* rs/describe-parseopt-fix (2023-07-21) 1 commit - (merged to 'next' on 2023-07-21 at e74749af0c) - + describe: fix --no-exact-match - - Command line parser fix. - - Will merge to 'master'. - source: <4eea7e15-6594-93e2-27b5-3d6e3c0baac6@web.de> - - -* rs/pack-objects-parseopt-fix (2023-07-21) 2 commits - (merged to 'next' on 2023-07-21 at acdf84416c) - + pack-objects: fix --no-quiet - + pack-objects: fix --no-keep-true-parents - - Command line parser fix. - - Will merge to 'master'. - source: - - -* jc/retire-get-sha1-hex (2023-07-24) 1 commit - - hex: retire get_sha1_hex() - - The implementation of "get_sha1_hex()" that reads a hexadecimal - string that spells a full object name has been extended to cope - with any hash function used in the repository, but the "sha1" in - its name survived. Rename it to get_hash_hex(), a name that is - more consistent within its friends like get_hash_hex_algop(). - - Will merge to 'next'. - source: - - -* rs/parse-options-negation-help (2023-07-24) 5 commits - - parse-options: show negatability of options in short help - - t1502: test option negation - - t1502: move optionspec help output to a file - - t1502, docs: disallow --no-help - - subtree: disallow --no-{help,quiet,debug,branch,message} - - "git cmd -h" learned to signal which options can be negated by - listing such options like "--[no-]opt". - - Comments? - Would showing "--[[no-]no-]opt" for "no-opt" be worth it? - cf. <9e8225dd-1e8b-8af2-c3e1-0c5834694244@web.de> - source: <4d01e971-07cb-4f11-3cc6-9d9f21e590c1@web.de> - - -* tb/commit-graph-tests (2023-07-24) 5 commits - - t/lib-commit-graph.sh: avoid sub-shell in `graph_git_behavior()` - - t5328: avoid top-level directory changes - - t5318: avoid top-level directory changes - - t/lib-commit-graph.sh: avoid directory change in `graph_git_behavior()` - - t/lib-commit-graph.sh: allow `graph_read_expect()` in sub-directories - - Test updates. - - Will merge to 'next'? - source: + source: -------------------------------------------------- [Stalled] @@ -351,57 +165,6 @@ Release tarballs are available at: source: -* ed/fsmonitor-windows-named-pipe (2023-03-24) 1 commit - - fsmonitor: handle differences between Windows named pipe functions - - Fix fsmonitor on Windows when the filesystem path contains certain - characters. - - Will discard. - Have been expecting a reroll for too long. - cf. - source: - - -* rn/sparse-diff-index (2023-04-10) 1 commit - - diff-index: enable sparse index - - "git diff-index" command has been taught to work better with the - sparse index. - - Will discard. - Have been expecting a reroll for too long. - cf. <62821012-4fc3-5ad8-695c-70f7ab14a8c9@github.com> - source: <20230408112342.404318-1-nanth.raghul@gmail.com> - - -* es/recurse-submodules-option-is-a-bool (2023-04-10) 1 commit - - usage: clarify --recurse-submodules as a boolean - - The "--[no-]recurse-submodules" option of "git checkout" and others - supported an undocumented syntax --recurse-submodules= where - the value can spell a Boolean in various ways. The support for the - syntax is being dropped. - - Will discard. - Have been expecting a reroll for too long. - cf. - source: - - -* cb/checkout-same-branch-twice (2023-03-22) 2 commits - - SQUASH??? the test marked to expect failure passes from day one - - checkout/switch: disallow checking out same branch in multiple worktrees - - "git checkout -B $branch" failed to protect against checking out - a branch that is checked out elsewhere, unlike "git branch -f" did. - - Will discard. - Have been expecting a hopefully minor and final reroll for too long. - cf. - source: <20230120113553.24655-1-carenas@gmail.com> - - * ab/tag-object-type-errors (2023-05-10) 4 commits - tag: don't emit potentially incorrect "object is a X, not a Y" - tag: don't misreport type of tagged objects in errors @@ -450,6 +213,154 @@ Release tarballs are available at: -------------------------------------------------- [Cooking] +* ah/sequencer-rewrite-todo-fix (2023-07-24) 1 commit + (merged to 'next' on 2023-07-26 at 24e74d9eda) + + sequencer: finish parsing the todo list despite an invalid first line + + When the user edits "rebase -i" todo file so that it starts with a + "fixup", which would make it invalid, the command truncated the + rest of the file before giving an error and returning the control + back to the user. Stop truncating to make it easier to correct + such a malformed todo file. + + Will merge to 'master'. + cf. + source: <20230722212830.132135-2-alexhenrie24@gmail.com> + + +* bb/trace2-comment-fix (2023-07-19) 1 commit + (merged to 'next' on 2023-07-21 at f77aeba1b5) + + trace2: fix a comment + + In-code comment fix. + + Will merge to 'master'. + source: <20230719232444.555838-1-dev+git@drbeat.li> + + +* ks/ref-filter-describe (2023-07-24) 2 commits + (merged to 'next' on 2023-07-26 at f4b3b3b7ef) + + ref-filter: add new "describe" atom + + ref-filter: add multiple-option parsing functions + + "git branch --list --format=" and friends are taught + a new "%(describe)" placeholder. + + Will merge to 'master'. + source: <20230723162717.68123-1-five231003@gmail.com> + + +* bb/use-trace2-counters-for-fsync-stats (2023-07-20) 1 commit + (merged to 'next' on 2023-07-26 at f2c2e3f2b9) + + wrapper: use trace2 counters to collect fsync stats + + Instead of inventing a custom counter variables for debugging, + use existing trace2 facility in the fsync customization codepath. + + Will merge to 'master'. + source: <20230720164823.625815-1-dev+git@drbeat.li> + + +* am/doc-sha256 (2023-07-20) 1 commit + - doc: sha256 is no longer experimental + + Tone down the warning on SHA-256 repositories being an experimental + curiosity. We do not have support for them to interoperate with + traditional SHA-1 repositories, but at this point, we do not plan + to make breaking changes to SHA-256 repositories and there is no + longer need for such a strongly phrased warning. + + Review comments sent. + cf. + source: + + +* hy/blame-in-bare-with-contents (2023-07-21) 1 commit + - blame: allow --contents to work with bare repo + + "git blame --contents=file" has been taught to work in a bare + repository. + + Will merge to 'next'? + source: <20230721035758.61956-1-hanyang.tony@bytedance.com> + + +* ja/worktree-orphan-fix (2023-07-26) 3 commits + (merged to 'next' on 2023-07-27 at e475016065) + + t2400: rewrite regex to avoid unintentional PCRE + + builtin/worktree.c: convert tab in advice to space + + t2400: drop no-op `--sq` from rev-parse call + + Fix tests with unportable regex patterns. + + Will merge to 'master'. + source: <20230726214202.15775-1-jacobabel@nullpo.dev> + + +* rs/describe-parseopt-fix (2023-07-21) 1 commit + (merged to 'next' on 2023-07-21 at e74749af0c) + + describe: fix --no-exact-match + + Command line parser fix. + + Will merge to 'master'. + source: <4eea7e15-6594-93e2-27b5-3d6e3c0baac6@web.de> + + +* rs/pack-objects-parseopt-fix (2023-07-21) 2 commits + (merged to 'next' on 2023-07-21 at acdf84416c) + + pack-objects: fix --no-quiet + + pack-objects: fix --no-keep-true-parents + + Command line parser fix. + + Will merge to 'master'. + source: + + +* jc/retire-get-sha1-hex (2023-07-24) 1 commit + (merged to 'next' on 2023-07-27 at eeb9cc37f5) + + hex: retire get_sha1_hex() + + The implementation of "get_sha1_hex()" that reads a hexadecimal + string that spells a full object name has been extended to cope + with any hash function used in the repository, but the "sha1" in + its name survived. Rename it to get_hash_hex(), a name that is + more consistent within its friends like get_hash_hex_algop(). + + Will merge to 'master'. + source: + + +* rs/parse-options-negation-help (2023-07-24) 5 commits + - parse-options: show negatability of options in short help + - t1502: test option negation + - t1502: move optionspec help output to a file + - t1502, docs: disallow --no-help + - subtree: disallow --no-{help,quiet,debug,branch,message} + + "git cmd -h" learned to signal which options can be negated by + listing such options like "--[no-]opt". + + Comments? + Would showing "--[[no-]no-]opt" for "no-opt" be worth it? + cf. <9e8225dd-1e8b-8af2-c3e1-0c5834694244@web.de> + source: <4d01e971-07cb-4f11-3cc6-9d9f21e590c1@web.de> + + +* tb/commit-graph-tests (2023-07-24) 5 commits + - t/lib-commit-graph.sh: avoid sub-shell in `graph_git_behavior()` + - t5328: avoid top-level directory changes + - t5318: avoid top-level directory changes + - t/lib-commit-graph.sh: avoid directory change in `graph_git_behavior()` + - t/lib-commit-graph.sh: allow `graph_read_expect()` in sub-directories + + Test updates. + + Will merge to 'next'? + source: + + * la/doc-choose-starting-point (2023-07-14) 5 commits (merged to 'next' on 2023-07-19 at 5a807cae46) + SubmittingPatches: simplify guidance for choosing a starting point @@ -457,54 +368,15 @@ Release tarballs are available at: + SubmittingPatches: de-emphasize branches as starting points + SubmittingPatches: discuss subsystems separately from git.git + SubmittingPatches: reword awkward phrasing + (this branch is used by la/doc-choose-starting-point-fixup.) Clarify how to choose the starting point for a new topic in developer guidance document. - Will merge to 'master'. + Will merge to 'master' together with the follow-on topic. source: -* jr/gitignore-doc-example-markup (2023-07-18) 1 commit - (merged to 'next' on 2023-07-19 at 4f2ece568d) - + gitignore.txt: use backticks instead of double quotes - - Doc update. - - Will merge to 'master'. - source: - - -* jc/am-parseopt-fix (2023-07-18) 1 commit - (merged to 'next' on 2023-07-19 at eaf592531e) - + am: simplify parsing of "--[no-]keep-cr" - - Code simplification. - - Will merge to 'master'. - source: - - -* jc/branch-parseopt-fix (2023-07-18) 1 commit - (merged to 'next' on 2023-07-19 at 738d25bbb6) - + branch: reject "--no-all" and "--no-remotes" early - - Command line parser fixes. - - Will merge to 'master'. - source: - - -* rs/ls-tree-no-full-name-fix (2023-07-18) 1 commit - (merged to 'next' on 2023-07-19 at 86e570c084) - + ls-tree: fix --no-full-name - - Command line parser fix. - - Will merge to 'master'. - source: - - * jc/doc-sent-patch-now-what (2023-07-19) 1 commit - MyFirstContribution: refrain from self-iterating too much @@ -514,26 +386,6 @@ Release tarballs are available at: source: -* jc/gitignore-doc-pattern-markup (2023-07-18) 1 commit - (merged to 'next' on 2023-07-20 at ecfc9c6118) - + gitignore.txt: mark up explanation of patterns consistently - - Doc mark-up update. - - Will merge to 'master'. - source: - - -* jc/parse-options-reset (2023-07-19) 1 commit - (merged to 'next' on 2023-07-20 at d2178a4bd4) - + reset: reject --no-(mixed|soft|hard|merge|keep) option - - Command line parser fix. - - Will merge to 'master'. - source: - - * jc/parse-options-short-help (2023-07-19) 3 commits - short help: allow a gap smaller than USAGE_GAP - remote: simplify "remote add --tags" help text @@ -545,28 +397,6 @@ Release tarballs are available at: source: -* jc/parse-options-show-branch (2023-07-19) 2 commits - (merged to 'next' on 2023-07-20 at 4fa809c2f2) - + show-branch: reject --[no-](topo|date)-order - + show-branch: --no-sparse should give dense output - - Command line parser fixes. - - Will merge to 'master'. - source: - - -* jc/transport-parseopt-fix (2023-07-18) 2 commits - (merged to 'next' on 2023-07-20 at 07f0026aaa) - + fetch: reject --no-ipv[46] - + parse-options: introduce OPT_IPVERSION() - - Command line parser fixes. - - Will merge to 'master'. - source: - - * sl/sparse-check-attr (2023-07-18) 3 commits - check-attr: integrate with sparse-index - attr.c: read attributes in a sparse directory @@ -606,17 +436,6 @@ Release tarballs are available at: source: -* jc/doc-submodule-update-settings (2023-07-13) 1 commit - . submodule: clarify that "!custom command" is the only oddball - - Rewrite the description of giving a custom command to the - submodule..update configuraiton variable. - - Expecting a reroll from the original author. - cf. <0d29ac42-4e8f-71b6-b85f-00de182e2957@imap.cc> - source: - - * jc/tree-walk-drop-base-offset (2023-07-07) 2 commits (merged to 'next' on 2023-07-25 at cc050c60a6) + tree-walk: drop unused base_offset from do_match() @@ -628,28 +447,33 @@ Release tarballs are available at: source: <20230707222116.4129415-1-gitster@pobox.com> -* mh/credential-erase-improvements-more (2023-06-24) 2 commits +* mh/credential-erase-improvements-more (2023-07-26) 2 commits - credential/wincred: erase matching creds only - credential/libsecret: erase matching creds only + Update two credential helpers to correctly match which credential + to erase; they dropped not the ones with stale password. + Needs review. + source: source: * cc/repack-sift-filtered-objects-to-separate-pack (2023-07-24) 8 commits - - gc: add `gc.repackFilterTo` config option - - repack: implement `--filter-to` for storing filtered out objects - - gc: add `gc.repackFilter` config option - - repack: add `--filter=` option - - repack: refactor finding pack prefix - - repack: refactor finishing pack-objects command - - t/helper: add 'find-pack' test-tool - - pack-objects: allow `--filter` without `--stdout` + . gc: add `gc.repackFilterTo` config option + . repack: implement `--filter-to` for storing filtered out objects + . gc: add `gc.repackFilter` config option + . repack: add `--filter=` option + . repack: refactor finding pack prefix + . repack: refactor finishing pack-objects command + . t/helper: add 'find-pack' test-tool + . pack-objects: allow `--filter` without `--stdout` "git repack" machinery learns to pay attention to the "--filter=" option. - Will merge to 'next'. + Breaks CI with some environment variables configured. + cf. source: <20230724085909.3831831-1-christian.couder@gmail.com> @@ -662,19 +486,22 @@ Release tarballs are available at: source: <0169ce6fb9ccafc089b74ae406db0d1a8ff8ac65.1688165272.git.steadmon@google.com> -* jt/path-filter-fix (2023-07-13) 4 commits +* jt/path-filter-fix (2023-07-25) 7 commits - commit-graph: new filter ver. that fixes murmur3 - repo-settings: introduce commitgraph.changedPathsVersion - t4216: test changed path filters with high bit paths + - t/helper/test-read-graph: implement `bloom-filters` mode + - bloom.h: make `load_bloom_filter_from_graph()` public + - t/helper/test-read-graph.c: extract `dump_graph_info()` - gitformat-commit-graph: describe version 2 of BDAT The Bloom filter used for path limited history traversal was broken on systems whose "char" is unsigned; update the implementation and bump the format version to 2. - Expecting a reroll. - cf. <20230720202203.3816309-1-jonathantanmy@google.com> - source: + Still under discussion. + cf. <20230727205308.401364-1-jonathantanmy@google.com> + source: * mh/credential-libsecret-attrs (2023-06-16) 1 commit @@ -711,6 +538,16 @@ Release tarballs are available at: -------------------------------------------------- [Discarded] +* jc/doc-submodule-update-settings (2023-07-13) 1 commit + . submodule: clarify that "!custom command" is the only oddball + + Rewrite the description of giving a custom command to the + submodule..update configuraiton variable. + + Superseded by pv/doc-submodule-update-settings topic. + source: + + * jc/rerere-read-rr-fix (2023-07-21) 1 commit . rerere: match the hash algorithm with its length @@ -718,3 +555,50 @@ Release tarballs are available at: Superseded by jc/retire-get-sha1-hex source: + + +* cb/checkout-same-branch-twice (2023-03-22) 2 commits + . SQUASH??? the test marked to expect failure passes from day one + . checkout/switch: disallow checking out same branch in multiple worktrees + + "git checkout -B $branch" failed to protect against checking out + a branch that is checked out elsewhere, unlike "git branch -f" did. + + Have been expecting a hopefully minor and final reroll for too long. + cf. + source: <20230120113553.24655-1-carenas@gmail.com> + + +* ed/fsmonitor-windows-named-pipe (2023-03-24) 1 commit + . fsmonitor: handle differences between Windows named pipe functions + + Fix fsmonitor on Windows when the filesystem path contains certain + characters. + + Have been expecting a reroll for too long. + cf. + source: + + +* rn/sparse-diff-index (2023-04-10) 1 commit + . diff-index: enable sparse index + + "git diff-index" command has been taught to work better with the + sparse index. + + Have been expecting a reroll for too long. + cf. <62821012-4fc3-5ad8-695c-70f7ab14a8c9@github.com> + source: <20230408112342.404318-1-nanth.raghul@gmail.com> + + +* es/recurse-submodules-option-is-a-bool (2023-04-10) 1 commit + . usage: clarify --recurse-submodules as a boolean + + The "--[no-]recurse-submodules" option of "git checkout" and others + supported an undocumented syntax --recurse-submodules= where + the value can spell a Boolean in various ways. The support for the + syntax is being dropped. + + Have been expecting a reroll for too long. + cf. + source: