{"thread":{"id":"60028","subject":"What's cooking in git.git (Jul 2023, #05; Tue, 25)","startedAt":"2023-07-25T20:58:06Z","lastAt":"2023-07-27T21:52:15Z","messageCount":11,"participants":["Junio C Hamano","Kousik Sanagavarapu","Taylor Blau","Phillip Wood","Linus Arver"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"479854","messageId":"xmqqedkvk8u4.fsf@gitster.g","threadId":"60028","inReplyTo":null,"subject":"What's cooking in git.git (Jul 2023, #05; Tue, 25)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-07-25T20:57:39Z","receivedAt":"2023-07-25T20:58:06Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Here are the topics that have been cooking in my tree.  Commits\nprefixed with '+' are in 'next' (being in 'next' is a sign that a\ntopic is stable enough to be used and are candidate to be in a\nfuture release).  Commits prefixed with '-' are only in 'seen', and\naren't considered \"accepted\" at all and may be annotated with an URL\nto a message that raises issues but they are no means exhaustive.  A\ntopic without enough support may be discarded after a long period of\nno activity (of course they can be resubmit when new interests\narise).\n\nCopies of the source code to Git live in many repositories, and the\nfollowing is a list of the ones I push into or their mirrors.  Some\nrepositories have only a subset of branches.\n\nWith maint, master, next, seen, todo:\n\n\tgit://git.kernel.org/pub/scm/git/git.git/\n\tgit://repo.or.cz/alt-git.git/\n\thttps://kernel.googlesource.com/pub/scm/git/git/\n\thttps://github.com/git/git/\n\thttps://gitlab.com/git-vcs/git/\n\nWith all the integration branches and topics broken out:\n\n\thttps://github.com/gitster/git/\n\nEven though the preformatted documentation in HTML and man format\nare not sources, they are published in these repositories for\nconvenience (replace \"htmldocs\" with \"manpages\" for the manual\npages):\n\n\tgit://git.kernel.org/pub/scm/git/git-htmldocs.git/\n\thttps://github.com/gitster/git-htmldocs.git/\n\nRelease tarballs are available at:\n\n\thttps://www.kernel.org/pub/software/scm/git/\n\n--------------------------------------------------\n[Graduated to 'master']\n\n* ah/advise-force-pushing (2023-07-13) 3 commits\n  (merged to 'next' on 2023-07-17 at b040e8280e)\n + push: don't imply that integration is always required before pushing\n + remote: don't imply that integration is always required before pushing\n + wt-status: don't show divergence advice when committing\n\n Help newbies by suggesting that there are cases where force-pushing\n is a valid and sensible thing to update a branch at a remote\n repository, rather than reconciling with merge/rebase.\n source: <20230713044128.3771818-1-alexhenrie24@gmail.com>\n\n\n* dk/bundle-i18n-more (2023-07-13) 1 commit\n  (merged to 'next' on 2023-07-18 at a9745efbe2)\n + i18n: mark more bundle.c strings for translation\n\n Update message mark-up for i18n in \"git bundle\".\n source: <pull.1550.git.1689285683013.gitgitgadget@gmail.com>\n\n\n* dk/t4002-syntaxo-fix (2023-07-14) 1 commit\n  (merged to 'next' on 2023-07-17 at 75d729ee52)\n + t4002: fix \"diff can read from stdin\" syntax\n\n Test fix.\n source: <pull.1545.git.git.1689341410476.gitgitgadget@gmail.com>\n\n\n* jk/nested-points-at (2023-07-17) 4 commits\n  (merged to 'next' on 2023-07-18 at cf33f44a50)\n + ref-filter: simplify return type of match_points_at\n + ref-filter: avoid parsing non-tags in match_points_at()\n + ref-filter: avoid parsing tagged objects in match_points_at()\n + ref-filter: handle nested tags in --points-at option\n\n \"git tag --list --points-at X\" showed tags that directly refers to\n object X, but did not list a tag that points at such a tag, which\n has been corrected.\n source: <20230702223342.GA1598765@coredump.intra.peff.net>\n\n\n* jk/unused-parameter (2023-07-13) 14 commits\n  (merged to 'next' on 2023-07-18 at 59d8f4ec1e)\n + t/helper: mark unused callback void data parameters\n + tag: mark unused parameters in each_tag_name_fn callbacks\n + rev-parse: mark unused parameter in for_each_abbrev callback\n + replace: mark unused parameter in each_mergetag_fn callback\n + replace: mark unused parameter in ref callback\n + merge-tree: mark unused parameter in traverse callback\n + fsck: mark unused parameters in various fsck callbacks\n + revisions: drop unused \"opt\" parameter in \"tweak\" callbacks\n + count-objects: mark unused parameter in alternates callback\n + am: mark unused keep_cr parameters\n + http-push: mark unused parameter in xml callback\n + http: mark unused parameters in curl callbacks\n + do_for_each_ref_helper(): mark unused repository parameter\n + test-ref-store: drop unimplemented reflog-expire command\n\n Mark-up unused parameters in the code so that we can eventually\n enable -Wunused-parameter by default.\n source: <20230703064347.GA3524892@coredump.intra.peff.net>\n\n\n* mh/mingw-case-sensitive-build (2023-06-12) 1 commit\n  (merged to 'next' on 2023-07-17 at 2c72856851)\n + mingw: use lowercase includes for some Windows headers\n\n Names of MinGW header files are spelled in mixed case in some\n source files, but the build host can be using case sensitive\n filesystem with header files with their name spelled in all\n lowercase.\n source: <20230604211934.1365289-1-mh@glandium.org>\n\n\n* rs/ref-filter-signature-fix (2023-07-17) 1 commit\n  (merged to 'next' on 2023-07-18 at e74f016a60)\n + t6300: fix setup with GPGSSH but without GPG\n\n Test fix.\n source: <cbc22750-af93-9274-2ed4-6dfd356568e8@web.de>\n\n\n* rs/strbuf-addftime-simplify (2023-07-17) 1 commit\n  (merged to 'next' on 2023-07-18 at d665b0f0e9)\n + strbuf: use skip_prefix() in strbuf_addftime()\n\n Code clean-up.\n source: <fccba24c-584d-6329-69a7-75cf0458af7d@web.de>\n\n\n* tb/object-access-overflow-protection (2023-07-14) 20 commits\n  (merged to 'next' on 2023-07-17 at 9ad8a08011)\n + commit-graph.c: prevent overflow in `verify_commit_graph()`\n + commit-graph.c: prevent overflow in `write_commit_graph()`\n + commit-graph.c: prevent overflow in `merge_commit_graph()`\n + commit-graph.c: prevent overflow in `split_graph_merge_strategy()`\n + commit-graph.c: prevent overflow in `load_tree_for_commit()`\n + commit-graph.c: prevent overflow in `fill_commit_in_graph()`\n + commit-graph.c: prevent overflow in `fill_commit_graph_info()`\n + commit-graph.c: prevent overflow in `load_oid_from_graph()`\n + commit-graph.c: prevent overflow in add_graph_to_chain()\n + commit-graph.c: prevent overflow in `write_commit_graph_file()`\n + pack-bitmap.c: ensure that eindex lookups don't overflow\n + midx.c: prevent overflow in `fill_included_packs_batch()`\n + midx.c: prevent overflow in `write_midx_internal()`\n + midx.c: store `nr`, `alloc` variables as `size_t`'s\n + midx.c: prevent overflow in `nth_midxed_offset()`\n + midx.c: prevent overflow in `nth_midxed_object_oid()`\n + midx.c: use `size_t`'s for fanout nr and alloc\n + packfile.c: use checked arithmetic in `nth_packed_object_offset()`\n + packfile.c: prevent overflow in `load_idx()`\n + packfile.c: prevent overflow in `nth_packed_object_id()`\n\n Various offset computation in the code that accesses the packfiles\n and other data in the object layer has been hardened against\n arithmetic overflow, especially on 32-bit systems.\n source: <ZLAJNbIBFUPHYhlt@nand.local>\n source: <cover.1689205042.git.me@ttaylorr.com>\n\n\n* tb/refs-exclusion-and-packed-refs (2023-07-10) 16 commits\n  (merged to 'next' on 2023-07-13 at 6d72f3e995)\n + ls-refs.c: avoid enumerating hidden refs where possible\n + upload-pack.c: avoid enumerating hidden refs where possible\n + builtin/receive-pack.c: avoid enumerating hidden references\n + refs.h: implement `hidden_refs_to_excludes()`\n + refs.h: let `for_each_namespaced_ref()` take excluded patterns\n + revision.h: store hidden refs in a `strvec`\n + refs/packed-backend.c: add trace2 counters for jump list\n + refs/packed-backend.c: implement jump lists to avoid excluded pattern(s)\n + refs/packed-backend.c: refactor `find_reference_location()`\n + refs: plumb `exclude_patterns` argument throughout\n + builtin/for-each-ref.c: add `--exclude` option\n + ref-filter.c: parameterize match functions over patterns\n + ref-filter: add `ref_filter_clear()`\n + ref-filter: clear reachable list pointers after freeing\n + ref-filter.h: provide `REF_FILTER_INIT`\n + refs.c: rename `ref_filter`\n\n Enumerating refs in the packed-refs file, while excluding refs that\n match certain patterns, has been optimized.\n source: <cover.1689023520.git.me@ttaylorr.com>\n\n--------------------------------------------------\n[New Topics]\n\n* ah/sequencer-rewrite-todo-fix (2023-07-24) 1 commit\n - sequencer: finish parsing the todo list despite an invalid first line\n\n When the user edits \"rebase -i\" todo file so that it starts with a\n \"fixup\", which would make it invalid, the command truncated the\n rest of the file before giving an error and returning the control\n back to the user.  Stop truncating to make it easier to correct\n such a malformed todo file.\n\n Will merge to 'next'.\n cf. <https://lore.kernel.org/git/0d1c5bfd-3ae5-83f0-a333-bbb8510a973a@gmail.com/>\n source: <20230722212830.132135-2-alexhenrie24@gmail.com>\n\n\n* bb/trace2-comment-fix (2023-07-19) 1 commit\n  (merged to 'next' on 2023-07-21 at f77aeba1b5)\n + trace2: fix a comment\n\n In-code comment fix.\n\n Will merge to 'master'.\n source: <20230719232444.555838-1-dev+git@drbeat.li>\n\n\n* ks/ref-filter-describe (2023-07-24) 2 commits\n - ref-filter: add new \"describe\" atom\n - ref-filter: add multiple-option parsing functions\n\n \"git branch --list --format=<format>\" and friends are taught\n a new \"%(describe)\" placeholder.\n\n Will merge to 'next'.\n source: <20230723162717.68123-1-five231003@gmail.com>\n\n\n* bb/use-trace2-counters-for-fsync-stats (2023-07-20) 1 commit\n - wrapper: use trace2 counters to collect fsync stats\n\n Instead of inventing a custom counter variables for debugging,\n use existing trace2 facility in the fsync customization codepath.\n\n Will merge to 'next'.\n source: <20230720164823.625815-1-dev+git@drbeat.li>\n\n\n* am/doc-sha256 (2023-07-20) 1 commit\n - doc: sha256 is no longer experimental\n\n Tone down the warning on SHA-256 repositories being an experimental\n curiosity.  We do not have support for them to interoperate with\n traditional SHA-1 repositories, but at this point, we do not plan\n to make breaking changes to SHA-256 repositories and there is no\n longer need for such a strongly phrased warning.\n\n Review comments sent.\n cf. <xmqqr0p230rj.fsf@gitster.g>\n source: <ZLlNtbAbVcYH7eFb@adams>\n\n\n* hy/blame-in-bare-with-contents (2023-07-21) 1 commit\n - blame: allow --contents to work with bare repo\n\n \"git blame --contents=file\" has been taught to work in a bare\n repository.\n\n Will merge to 'next'?\n source: <20230721035758.61956-1-hanyang.tony@bytedance.com>\n\n\n* ja/worktree-orphan-fix (2023-07-21) 4 commits\n - SQUASH???\n - t2400: rewrite regex to avoid unintentional PCRE\n - builtin/worktree.c: convert tab in advice to space\n - t2400: drop no-op `--sq` from rev-parse call\n\n Expecting a reroll.\n cf. <axnxvnmo6ekhhccppinji73ivlandwuqs44epmq4pdefm7ukiv@ejz7bee5xjli>\n source: <20230721044012.24360-1-jacobabel@nullpo.dev>\n\n\n* rs/describe-parseopt-fix (2023-07-21) 1 commit\n  (merged to 'next' on 2023-07-21 at e74749af0c)\n + describe: fix --no-exact-match\n\n Command line parser fix.\n\n Will merge to 'master'.\n source: <4eea7e15-6594-93e2-27b5-3d6e3c0baac6@web.de>\n\n\n* rs/pack-objects-parseopt-fix (2023-07-21) 2 commits\n  (merged to 'next' on 2023-07-21 at acdf84416c)\n + pack-objects: fix --no-quiet\n + pack-objects: fix --no-keep-true-parents\n\n Command line parser fix.\n\n Will merge to 'master'.\n source: <xmqqo7k9fa5x.fsf@gitster.g>\n\n\n* jc/retire-get-sha1-hex (2023-07-24) 1 commit\n - hex: retire get_sha1_hex()\n\n The implementation of \"get_sha1_hex()\" that reads a hexadecimal\n string that spells a full object name has been extended to cope\n with any hash function used in the repository, but the \"sha1\" in\n its name survived.  Rename it to get_hash_hex(), a name that is\n more consistent within its friends like get_hash_hex_algop().\n\n Will merge to 'next'.\n source: <xmqq1qgwoqgo.fsf_-_@gitster.g>\n\n\n* rs/parse-options-negation-help (2023-07-24) 5 commits\n - parse-options: show negatability of options in short help\n - t1502: test option negation\n - t1502: move optionspec help output to a file\n - t1502, docs: disallow --no-help\n - subtree: disallow --no-{help,quiet,debug,branch,message}\n\n \"git cmd -h\" learned to signal which options can be negated by\n listing such options like \"--[no-]opt\".\n\n Comments?\n Would showing \"--[[no-]no-]opt\" for \"no-opt\" be worth it?\n cf. <9e8225dd-1e8b-8af2-c3e1-0c5834694244@web.de>\n source: <4d01e971-07cb-4f11-3cc6-9d9f21e590c1@web.de>\n\n\n* tb/commit-graph-tests (2023-07-24) 5 commits\n - t/lib-commit-graph.sh: avoid sub-shell in `graph_git_behavior()`\n - t5328: avoid top-level directory changes\n - t5318: avoid top-level directory changes\n - t/lib-commit-graph.sh: avoid directory change in `graph_git_behavior()`\n - t/lib-commit-graph.sh: allow `graph_read_expect()` in sub-directories\n\n Test updates.\n\n Will merge to 'next'?\n source: <cover.1690216758.git.me@ttaylorr.com>\n\n--------------------------------------------------\n[Stalled]\n\n* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit\n - cherry-pick: refuse cherry-pick sequence if index is dirty\n\n \"git cherry-pick A\" that replays a single commit stopped before\n clobbering local modification, but \"git cherry-pick A..B\" did not,\n which has been corrected.\n\n Expecting a reroll.\n cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>\n source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>\n\n\n* ed/fsmonitor-windows-named-pipe (2023-03-24) 1 commit\n - fsmonitor: handle differences between Windows named pipe functions\n\n Fix fsmonitor on Windows when the filesystem path contains certain\n characters.\n\n Will discard.\n Have been expecting a reroll for too long.\n cf. <b9cf67e4-22a7-2ff0-8310-9223bea10d6d@jeffhostetler.com>\n source: <pull.1503.git.1679678090412.gitgitgadget@gmail.com>\n\n\n* rn/sparse-diff-index (2023-04-10) 1 commit\n - diff-index: enable sparse index\n\n \"git diff-index\" command has been taught to work better with the\n sparse index.\n\n Will discard.\n Have been expecting a reroll for too long.\n cf. <62821012-4fc3-5ad8-695c-70f7ab14a8c9@github.com>\n source: <20230408112342.404318-1-nanth.raghul@gmail.com>\n\n\n* es/recurse-submodules-option-is-a-bool (2023-04-10) 1 commit\n - usage: clarify --recurse-submodules as a boolean\n\n The \"--[no-]recurse-submodules\" option of \"git checkout\" and others\n supported an undocumented syntax --recurse-submodules=<value> where\n the value can spell a Boolean in various ways.  The support for the\n syntax is being dropped.\n\n Will discard.\n Have been expecting a reroll for too long.\n cf. <ZDSTFwMFO7vbj/du@google.com>\n source: <ZDSTFwMFO7vbj/du@google.com>\n\n\n* cb/checkout-same-branch-twice (2023-03-22) 2 commits\n - SQUASH??? the test marked to expect failure passes from day one\n - checkout/switch: disallow checking out same branch in multiple worktrees\n\n \"git checkout -B $branch\" failed to protect against checking out\n a branch that is checked out elsewhere, unlike \"git branch -f\" did.\n\n Will discard.\n Have been expecting a hopefully minor and final reroll for too long.\n cf. <CAPUEspj_Bh+LgYLnWfeBdcq_uV5Cbou-7H51GLFjzSa5Qzby9w@mail.gmail.com>\n source: <20230120113553.24655-1-carenas@gmail.com>\n\n\n* ab/tag-object-type-errors (2023-05-10) 4 commits\n - tag: don't emit potentially incorrect \"object is a X, not a Y\"\n - tag: don't misreport type of tagged objects in errors\n - object tests: add test for unexpected objects in tags\n - Merge branch 'jk/parse-object-type-mismatch' into ab/tag-object-type-errors\n\n Hardening checks around mismatched object types when one of those\n objects is a tag.\n\n Will discard.\n Stalled for too long.\n source: <cover-v2-0.3-00000000000-20221230T011725Z-avarab@gmail.com>\n\n\n* ob/revert-of-revert (2023-05-05) 1 commit\n - sequencer: beautify subject of reverts of reverts\n\n Instead of \"Revert \"Revert \"original\"\", give \"Reapply \"original\"\"\n as the title for a revert of a revert.\n\n Will discard.\n Have been expecting a hopefully final reroll for too long.\n Looking much better, except for minor cosmetic issues.\n cf. <xmqqmt21txid.fsf@gitster.g>\n source: <20230428083528.1699221-1-oswald.buddenhagen@gmx.de>\n\n\n* pw/rebase-i-after-failure (2023-04-21) 6 commits\n - rebase -i: fix adding failed command to the todo list\n - rebase: fix rewritten list for failed pick\n - rebase --continue: refuse to commit after failed command\n - sequencer: factor out part of pick_commits()\n - rebase -i: remove patch file after conflict resolution\n - rebase -i: move unlink() calls\n\n Various fixes to the behaviour of \"rebase -i\" when the command got\n interrupted by conflicting changes.\n\n Will discard.\n Have been expecting a reroll for too long.\n cf. <xmqqsfcthrpb.fsf@gitster.g>\n cf. <1fd54422-b66a-c2e4-7cd7-934ea01190ad@gmail.com>\n cf. <55dd6194-25e5-1a66-9c39-27cb19bfbb3c@gmail.com>\n source: <pull.1492.v2.git.1682089074.gitgitgadget@gmail.com>\n\n--------------------------------------------------\n[Cooking]\n\n* la/doc-choose-starting-point (2023-07-14) 5 commits\n  (merged to 'next' on 2023-07-19 at 5a807cae46)\n + SubmittingPatches: simplify guidance for choosing a starting point\n + SubmittingPatches: emphasize need to communicate non-default starting points\n + SubmittingPatches: de-emphasize branches as starting points\n + SubmittingPatches: discuss subsystems separately from git.git\n + SubmittingPatches: reword awkward phrasing\n\n Clarify how to choose the starting point for a new topic in\n developer guidance document.\n\n Will merge to 'master'.\n source: <pull.1556.v2.git.1689314493.gitgitgadget@gmail.com>\n\n\n* jr/gitignore-doc-example-markup (2023-07-18) 1 commit\n  (merged to 'next' on 2023-07-19 at 4f2ece568d)\n + gitignore.txt: use backticks instead of double quotes\n\n Doc update.\n\n Will merge to 'master'.\n source: <pull.1553.git.git.1689685982027.gitgitgadget@gmail.com>\n\n\n* jc/am-parseopt-fix (2023-07-18) 1 commit\n  (merged to 'next' on 2023-07-19 at eaf592531e)\n + am: simplify parsing of \"--[no-]keep-cr\"\n\n Code simplification.\n\n Will merge to 'master'.\n source: <xmqqr0p5gjv3.fsf@gitster.g>\n\n\n* jc/branch-parseopt-fix (2023-07-18) 1 commit\n  (merged to 'next' on 2023-07-19 at 738d25bbb6)\n + branch: reject \"--no-all\" and \"--no-remotes\" early\n\n Command line parser fixes.\n\n Will merge to 'master'.\n source: <xmqqjzuxgjmi.fsf@gitster.g>\n\n\n* rs/ls-tree-no-full-name-fix (2023-07-18) 1 commit\n  (merged to 'next' on 2023-07-19 at 86e570c084)\n + ls-tree: fix --no-full-name\n\n Command line parser fix.\n\n Will merge to 'master'.\n source: <d392a005-4eba-7cc7-9554-cdb8dc53975e@web.de>\n\n\n* jc/doc-sent-patch-now-what (2023-07-19) 1 commit\n - MyFirstContribution: refrain from self-iterating too much\n\n Process document update.\n\n Will merge to 'next'?\n source: <xmqqzga9opdu.fsf@gitster.g>\n\n\n* jc/gitignore-doc-pattern-markup (2023-07-18) 1 commit\n  (merged to 'next' on 2023-07-20 at ecfc9c6118)\n + gitignore.txt: mark up explanation of patterns consistently\n\n Doc mark-up update.\n\n Will merge to 'master'.\n source: <xmqqwmyxglhg.fsf@gitster.g>\n\n\n* jc/parse-options-reset (2023-07-19) 1 commit\n  (merged to 'next' on 2023-07-20 at d2178a4bd4)\n + reset: reject --no-(mixed|soft|hard|merge|keep) option\n\n Command line parser fix.\n\n Will merge to 'master'.\n source: <xmqq1qh4c998.fsf@gitster.g>\n\n\n* jc/parse-options-short-help (2023-07-19) 3 commits\n - short help: allow a gap smaller than USAGE_GAP\n - remote: simplify \"remote add --tags\" help text\n - short help: allow multi-line opthelp\n\n Command line parser fix, and a small parse-options API update.\n\n Comments?\n source: <xmqq5y6gg8fn.fsf@gitster.g>\n\n\n* jc/parse-options-show-branch (2023-07-19) 2 commits\n  (merged to 'next' on 2023-07-20 at 4fa809c2f2)\n + show-branch: reject --[no-](topo|date)-order\n + show-branch: --no-sparse should give dense output\n\n Command line parser fixes.\n\n Will merge to 'master'.\n source: <xmqqh6pzc15n.fsf@gitster.g>\n\n\n* jc/transport-parseopt-fix (2023-07-18) 2 commits\n  (merged to 'next' on 2023-07-20 at 07f0026aaa)\n + fetch: reject --no-ipv[46]\n + parse-options: introduce OPT_IPVERSION()\n\n Command line parser fixes.\n\n Will merge to 'master'.\n source: <xmqqedl4gag8.fsf@gitster.g>\n\n\n* sl/sparse-check-attr (2023-07-18) 3 commits\n - check-attr: integrate with sparse-index\n - attr.c: read attributes in a sparse directory\n - t1092: add tests for 'git check-attr'\n\n Teach \"git check-attr\" work better with sparse-index.\n\n Expecting a reroll.\n cf. <c3ebe3b4-88b9-8ca2-2ee3-39a3e0d82201@github.com>\n cf. <5e478d8b-9ef4-864b-41e4-e0a79877d278@github.com>\n source: <20230718232916.31660-1-cheskaqiqi@gmail.com>\n\n\n* ah/autoconf-fixes (2023-07-19) 3 commits\n  (merged to 'next' on 2023-07-25 at 35ff66e0cb)\n + configure.ac: always save NO_ICONV to config.status\n + configure.ac: don't overwrite NO_CURL option\n + configure.ac: don't overwrite NO_EXPAT option\n\n \"./configure --with-expat=no\" did not work as a way to refuse use\n of the expat library on a system with the library installed, which\n has been corrected.\n\n Will merge to 'master'.\n source: <20230719145211.17854-2-aherrmann@suse.de>\n\n\n* jc/branch-in-use-error-message (2023-07-21) 1 commit\n - branch: update the message to refuse touching a branch in-use\n\n \"git branch -f X\" to repoint the branch X seid that X was \"checked\n out\" in another worktree, even when branch X was not and instead\n being bisected or rebased.  The message was reworded to say the\n branch was \"in use\".\n\n Will merge to 'next'?\n source: <xmqqr0p1szhz.fsf_-_@gitster.g>\n\n\n* jc/doc-submodule-update-settings (2023-07-13) 1 commit\n . submodule: clarify that \"!custom command\" is the only oddball\n\n Rewrite the description of giving a custom command to the\n submodule.<name>.update configuraiton variable.\n\n Expecting a reroll from the original author.\n cf. <0d29ac42-4e8f-71b6-b85f-00de182e2957@imap.cc>\n source: <xmqqwmz3oacg.fsf@gitster.g>\n\n\n* jc/tree-walk-drop-base-offset (2023-07-07) 2 commits\n  (merged to 'next' on 2023-07-25 at cc050c60a6)\n + tree-walk: drop unused base_offset from do_match()\n + tree-walk: lose base_offset that is never used in tree_entry_interesting\n\n Code simplification.\n\n Will merge to 'master'.\n source: <20230707222116.4129415-1-gitster@pobox.com>\n\n\n* mh/credential-erase-improvements-more (2023-06-24) 2 commits\n - credential/wincred: erase matching creds only\n - credential/libsecret: erase matching creds only\n\n Needs review.\n source: <pull.1529.git.git.1687596777147.gitgitgadget@gmail.com>\n\n\n* cc/repack-sift-filtered-objects-to-separate-pack (2023-07-24) 8 commits\n - gc: add `gc.repackFilterTo` config option\n - repack: implement `--filter-to` for storing filtered out objects\n - gc: add `gc.repackFilter` config option\n - repack: add `--filter=<filter-spec>` option\n - repack: refactor finding pack prefix\n - repack: refactor finishing pack-objects command\n - t/helper: add 'find-pack' test-tool\n - pack-objects: allow `--filter` without `--stdout`\n\n \"git repack\" machinery learns to pay attention to the \"--filter=\"\n option.\n\n Will merge to 'next'.\n source: <20230724085909.3831831-1-christian.couder@gmail.com>\n\n\n* js/doc-unit-tests (2023-06-30) 1 commit\n - unit tests: Add a project plan document\n\n Process to add some form of low-level unit tests has started.\n\n Still filling in blanks.\n source: <0169ce6fb9ccafc089b74ae406db0d1a8ff8ac65.1688165272.git.steadmon@google.com>\n\n\n* jt/path-filter-fix (2023-07-13) 4 commits\n - commit-graph: new filter ver. that fixes murmur3\n - repo-settings: introduce commitgraph.changedPathsVersion\n - t4216: test changed path filters with high bit paths\n - gitformat-commit-graph: describe version 2 of BDAT\n\n The Bloom filter used for path limited history traversal was broken\n on systems whose \"char\" is unsigned; update the implementation and\n bump the format version to 2.\n\n Expecting a reroll.\n cf. <20230720202203.3816309-1-jonathantanmy@google.com>\n source: <cover.1689283789.git.jonathantanmy@google.com>\n\n\n* mh/credential-libsecret-attrs (2023-06-16) 1 commit\n - credential/libsecret: store new attributes\n\n The way authentication related data other than passwords (e.g.\n oath token and password expiration data) are stored in libsecret\n keyrings has been rethought.\n\n Needs review.\n source: <pull.1469.v5.git.git.1686945306242.gitgitgadget@gmail.com>\n\n\n* cc/git-replay (2023-06-03) 15 commits\n - replay: stop assuming replayed branches do not diverge\n - replay: add --contained to rebase contained branches\n - replay: add --advance or 'cherry-pick' mode\n - replay: disallow revision specific options and pathspecs\n - replay: use standard revision ranges\n - replay: make it a minimal server side command\n - replay: remove HEAD related sanity check\n - replay: remove progress and info output\n - replay: add an important FIXME comment about gpg signing\n - replay: don't simplify history\n - replay: introduce pick_regular_commit()\n - replay: die() instead of failing assert()\n - replay: start using parse_options API\n - replay: introduce new builtin\n - t6429: remove switching aspects of fast-rebase\n\n What's the status of this thing?\n source: <20230602102533.876905-1-christian.couder@gmail.com>\n\n--------------------------------------------------\n[Discarded]\n\n* jc/rerere-read-rr-fix (2023-07-21) 1 commit\n . rerere: match the hash algorithm with its length\n\n SHA-256 fix.\n\n Superseded by jc/retire-get-sha1-hex\n source: <xmqqa5vou9ar.fsf@gitster.g>\n"},{"id":"479855","messageId":"xmqqa5vjk8rm.fsf@gitster.g","threadId":"60028","inReplyTo":"xmqqedkvk8u4.fsf@gitster.g","subject":"Re: What's cooking in git.git (Jul 2023, #05; Tue, 25)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-07-25T20:59:09Z","receivedAt":"2023-07-25T20:59:17Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Here is a list of one-line summary for topics in flight.\n\nThe dates are committer date for topics not in 'next' (i.e.\ntypically the first time I happened to have \"seen\" them); for the\ntopics in 'next', there is a second date that shows when the topic\nwas last merged to 'next'.  Typically a topic is expected to spend\n7 or so calendar days in 'next' before graduating to 'master'.\n\n----------------------------------------------------------------\nExpecting a reroll from the original author.\n - jc/doc-submodule-update-settings                             07-13          #1\n\nExpecting a reroll.\n - tk/cherry-pick-sequence-requires-clean-worktree              06-01          #1\n - jt/path-filter-fix                                           07-13          #4\n - sl/sparse-check-attr                                         07-18          #3\n - ja/worktree-orphan-fix                                       07-21          #4\n\nNeeds review.\n - mh/credential-libsecret-attrs                                06-16          #1\n - mh/credential-erase-improvements-more                        06-24          #2\n\nStill filling in blanks.\n - js/doc-unit-tests                                            06-30          #1\n\nUndecided\n - cc/git-replay                                                06-03         #15\n - jc/parse-options-short-help                                  07-19          #3\n - am/doc-sha256                                                07-20          #1\n - rs/parse-options-negation-help                               07-24          #5\n\nWill discard.\n - cb/checkout-same-branch-twice                                03-22          #2\n - ed/fsmonitor-windows-named-pipe                              03-24          #1\n - rn/sparse-diff-index                                         04-10          #1\n - es/recurse-submodules-option-is-a-bool                       04-10          #1\n - pw/rebase-i-after-failure                                    04-21          #6\n - ob/revert-of-revert                                          05-05          #1\n - ab/tag-object-type-errors                                    05-10          #4\n\nWill merge to 'master'.\n + la/doc-choose-starting-point                                 07-14/07-19    #5\n + jr/gitignore-doc-example-markup                              07-18/07-19    #1\n + jc/am-parseopt-fix                                           07-18/07-19    #1\n + jc/branch-parseopt-fix                                       07-18/07-19    #1\n + rs/ls-tree-no-full-name-fix                                  07-18/07-19    #1\n + jc/gitignore-doc-pattern-markup                              07-18/07-20    #1\n + jc/transport-parseopt-fix                                    07-18/07-20    #2\n + jc/parse-options-reset                                       07-19/07-20    #1\n + jc/parse-options-show-branch                                 07-19/07-20    #2\n + bb/trace2-comment-fix                                        07-19/07-21    #1\n + rs/describe-parseopt-fix                                     07-21/07-21    #1\n + rs/pack-objects-parseopt-fix                                 07-21/07-21    #2\n + jc/tree-walk-drop-base-offset                                07-07/07-25    #2\n + ah/autoconf-fixes                                            07-19/07-25    #3\n\nWill merge to 'next'.\n - bb/use-trace2-counters-for-fsync-stats                       07-20          #1\n - ah/sequencer-rewrite-todo-fix                                07-24          #1\n - ks/ref-filter-describe                                       07-24          #2\n - jc/retire-get-sha1-hex                                       07-24          #1\n - cc/repack-sift-filtered-objects-to-separate-pack             07-24          #8\n\nWill merge to 'next'?\n - jc/doc-sent-patch-now-what                                   07-19          #1\n - hy/blame-in-bare-with-contents                               07-21          #1\n - jc/branch-in-use-error-message                               07-21          #1\n - tb/commit-graph-tests                                        07-24          #5\n"},{"id":"479861","messageId":"ZMA78xwfCE1-paE-@five231003","threadId":"60028","inReplyTo":"xmqqedkvk8u4.fsf@gitster.g","subject":"Re: What's cooking in git.git (Jul 2023, #05; Tue, 25)","fromName":"Kousik Sanagavarapu","fromEmail":"five231003@gmail.com","sentAt":"2023-07-25T21:17:39Z","receivedAt":"2023-07-25T21:18:05Z","isPatch":false,"sender":{"key":"five231003@gmail.com","avatar":"https://avatars.githubusercontent.com/u/75560439?v=4"},"body":"Junio C Hamano <gitster@pobox.com> wrote:\n\n> [New Topics]\n\n> * ks/ref-filter-describe (2023-07-24) 2 commits\n>  - ref-filter: add new \"describe\" atom\n>  - ref-filter: add multiple-option parsing functions\n> \n>  \"git branch --list --format=<format>\" and friends are taught\n>  a new \"%(describe)\" placeholder.\n> \n>  Will merge to 'next'.\n>  source: <20230723162717.68123-1-five231003@gmail.com>\n\nHi,\n\nCould you merge the version (v5) that I sent out just now to 'next'\ninstead of these? They address a minor change.\n\nThe patches are at\n\n\thttps://lore.kernel.org/git/20230725205924.40585-1-five231003@gmail.com/\n\nThanks\n"},{"id":"479865","messageId":"xmqqzg3jhd8v.fsf@gitster.g","threadId":"60028","inReplyTo":"ZMA78xwfCE1-paE-@five231003","subject":"Re: What's cooking in git.git (Jul 2023, #05; Tue, 25)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-07-25T21:50:40Z","receivedAt":"2023-07-25T21:50:47Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Kousik Sanagavarapu <five231003@gmail.com> writes:\n\n> Junio C Hamano <gitster@pobox.com> wrote:\n>\n>> [New Topics]\n>\n>> * ks/ref-filter-describe (2023-07-24) 2 commits\n>>  - ref-filter: add new \"describe\" atom\n>>  - ref-filter: add multiple-option parsing functions\n>> \n>>  \"git branch --list --format=<format>\" and friends are taught\n>>  a new \"%(describe)\" placeholder.\n>> \n>>  Will merge to 'next'.\n>>  source: <20230723162717.68123-1-five231003@gmail.com>\n>\n> Hi,\n>\n> Could you merge the version (v5) that I sent out just now to 'next'\n> instead of these? They address a minor change.\n\nNah, that is not worth it, as I've already done ! -> test_must_fail\nfix locally yesterday.\n\nThanks.\n"},{"id":"479868","messageId":"ZMBPHTIacaWjy99D@nand.local","threadId":"60028","inReplyTo":"xmqqedkvk8u4.fsf@gitster.g","subject":"Re: What's cooking in git.git (Jul 2023, #05; Tue, 25)","fromName":"Taylor Blau","fromEmail":"me@ttaylorr.com","sentAt":"2023-07-25T22:39:25Z","receivedAt":"2023-07-25T22:46:15Z","isPatch":false,"sender":{"key":"me@ttaylorr.com","avatar":"https://avatars.githubusercontent.com/u/301000140?v=4"},"body":"On Tue, Jul 25, 2023 at 01:57:39PM -0700, Junio C Hamano wrote:\n> * cc/repack-sift-filtered-objects-to-separate-pack (2023-07-24) 8 commits\n>  - gc: add `gc.repackFilterTo` config option\n>  - repack: implement `--filter-to` for storing filtered out objects\n>  - gc: add `gc.repackFilter` config option\n>  - repack: add `--filter=<filter-spec>` option\n>  - repack: refactor finding pack prefix\n>  - repack: refactor finishing pack-objects command\n>  - t/helper: add 'find-pack' test-tool\n>  - pack-objects: allow `--filter` without `--stdout`\n>\n>  \"git repack\" machinery learns to pay attention to the \"--filter=\"\n>  option.\n>\n>  Will merge to 'next'.\n>  source: <20230724085909.3831831-1-christian.couder@gmail.com>\n\nThis may be a little soon to merge into 'next'. I looked at version 1\nand had some concerns, but haven't had a chance to look at version 2.\n\nNow that we have a third round, I'll take a look at it now. Sorry for\nthe hold up.\n\nThanks,\nTaylor\n"},{"id":"479879","messageId":"xmqq8rb3h7av.fsf@gitster.g","threadId":"60028","inReplyTo":"ZMBPHTIacaWjy99D@nand.local","subject":"Re: What's cooking in git.git (Jul 2023, #05; Tue, 25)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-07-25T23:59:04Z","receivedAt":"2023-07-25T23:59:12Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Taylor Blau <me@ttaylorr.com> writes:\n\n> On Tue, Jul 25, 2023 at 01:57:39PM -0700, Junio C Hamano wrote:\n>> * cc/repack-sift-filtered-objects-to-separate-pack (2023-07-24) 8 commits\n>> ...\n>>  Will merge to 'next'.\n>>  source: <20230724085909.3831831-1-christian.couder@gmail.com>\n>\n> This may be a little soon to merge into 'next'. I looked at version 1\n> and had some concerns, but haven't had a chance to look at version 2.\n>\n> Now that we have a third round, I'll take a look at it now. Sorry for\n> the hold up.\n\nThanks.\n"},{"id":"479882","messageId":"ZMCHybvLPQ5_MVuR@five231003","threadId":"60028","inReplyTo":"xmqqzg3jhd8v.fsf@gitster.g","subject":"Re: What's cooking in git.git (Jul 2023, #05; Tue, 25)","fromName":"Kousik Sanagavarapu","fromEmail":"five231003@gmail.com","sentAt":"2023-07-26T02:41:13Z","receivedAt":"2023-07-26T02:41:48Z","isPatch":false,"sender":{"key":"five231003@gmail.com","avatar":"https://avatars.githubusercontent.com/u/75560439?v=4"},"body":"Junio C Hamano <gitster@pobox.com> wrote:\n\n> Nah, that is not worth it, as I've already done ! -> test_must_fail\n> fix locally yesterday.\n\nOh, thanks.\n"},{"id":"479897","messageId":"9d2f119d-7da7-003d-d011-5c3aa7f94ae7@gmail.com","threadId":"60028","inReplyTo":"xmqqedkvk8u4.fsf@gitster.g","subject":"Re: What's cooking in git.git (Jul 2023, #05; Tue, 25)","fromName":"Phillip Wood","fromEmail":"phillip.wood123@gmail.com","sentAt":"2023-07-26T13:11:45Z","receivedAt":"2023-07-26T13:11:52Z","isPatch":false,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"On 25/07/2023 21:57, Junio C Hamano wrote:\n> * pw/rebase-i-after-failure (2023-04-21) 6 commits\n>   - rebase -i: fix adding failed command to the todo list\n>   - rebase: fix rewritten list for failed pick\n>   - rebase --continue: refuse to commit after failed command\n>   - sequencer: factor out part of pick_commits()\n>   - rebase -i: remove patch file after conflict resolution\n>   - rebase -i: move unlink() calls\n> \n>   Various fixes to the behaviour of \"rebase -i\" when the command got\n>   interrupted by conflicting changes.\n> \n>   Will discard.\n>   Have been expecting a reroll for too long.\n\nI am slowly working on a new version, but it probably makes sense to \ndrop it in the meantime as it has been so long that the new version \nprobably wants to be rebased onto master anyway.\n\nBest Wishes\n\nPhillip\n\n>   cf. <xmqqsfcthrpb.fsf@gitster.g>\n>   cf. <1fd54422-b66a-c2e4-7cd7-934ea01190ad@gmail.com>\n>   cf. <55dd6194-25e5-1a66-9c39-27cb19bfbb3c@gmail.com>\n>   source: <pull.1492.v2.git.1682089074.gitgitgadget@gmail.com>\n\n"},{"id":"479900","messageId":"xmqqpm4eeiny.fsf@gitster.g","threadId":"60028","inReplyTo":"9d2f119d-7da7-003d-d011-5c3aa7f94ae7@gmail.com","subject":"Re: What's cooking in git.git (Jul 2023, #05; Tue, 25)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-07-26T16:34:09Z","receivedAt":"2023-07-26T16:34:17Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Phillip Wood <phillip.wood123@gmail.com> writes:\n\n> On 25/07/2023 21:57, Junio C Hamano wrote:\n>> * pw/rebase-i-after-failure (2023-04-21) 6 commits\n>>   - rebase -i: fix adding failed command to the todo list\n>>   - rebase: fix rewritten list for failed pick\n>>   - rebase --continue: refuse to commit after failed command\n>>   - sequencer: factor out part of pick_commits()\n>>   - rebase -i: remove patch file after conflict resolution\n>>   - rebase -i: move unlink() calls\n>>   Various fixes to the behaviour of \"rebase -i\" when the command got\n>>   interrupted by conflicting changes.\n>>   Will discard.\n>>   Have been expecting a reroll for too long.\n>\n> I am slowly working on a new version, but it probably makes sense to\n> drop it in the meantime as it has been so long that the new version\n> probably wants to be rebased onto master anyway.\n\nYeah, I think that is a good next step.  Unfortunately, folks who\nhave seen this round would likely have already forgotten and the\nupdated round would need fresh reviews anyway.\n\nThanks.\n"},{"id":"479943","messageId":"owlyedktf3of.fsf@fine.c.googlers.com","threadId":"60028","inReplyTo":"xmqqedkvk8u4.fsf@gitster.g","subject":"Re: What's cooking in git.git (Jul 2023, #05; Tue, 25)","fromName":"Linus Arver","fromEmail":"linusa@google.com","sentAt":"2023-07-27T21:24:48Z","receivedAt":"2023-07-27T21:25:24Z","isPatch":false,"sender":{"key":"linus@ucla.edu","avatar":null},"body":"Junio C Hamano <gitster@pobox.com> writes:\n\n> ...\n> \n> --------------------------------------------------\n> [Cooking]\n>\n> ...\n> \n> * jc/doc-sent-patch-now-what (2023-07-19) 1 commit\n>  - MyFirstContribution: refrain from self-iterating too much\n>\n>  Process document update.\n>\n>  Will merge to 'next'?\n>  source: <xmqqzga9opdu.fsf@gitster.g>\n\nPlease wait until seeing my review (will send later today).\n"},{"id":"479946","messageId":"xmqqpm4d9g54.fsf@gitster.g","threadId":"60028","inReplyTo":"owlyedktf3of.fsf@fine.c.googlers.com","subject":"Re: What's cooking in git.git (Jul 2023, #05; Tue, 25)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-07-27T21:52:07Z","receivedAt":"2023-07-27T21:52:15Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Linus Arver <linusa@google.com> writes:\n\n> Junio C Hamano <gitster@pobox.com> writes:\n>\n>> ...\n>> \n>> --------------------------------------------------\n>> [Cooking]\n>>\n>> ...\n>> \n>> * jc/doc-sent-patch-now-what (2023-07-19) 1 commit\n>>  - MyFirstContribution: refrain from self-iterating too much\n>>\n>>  Process document update.\n>>\n>>  Will merge to 'next'?\n>>  source: <xmqqzga9opdu.fsf@gitster.g>\n>\n> Please wait until seeing my review (will send later today).\n\nThanks.\n"}]}