{"thread":{"id":"59922","subject":"What's cooking in git.git (Jun 2023, #07; Tue, 27)","startedAt":"2023-06-27T22:11:28Z","lastAt":"2023-06-28T23:59:27Z","messageCount":9,"participants":["Junio C Hamano","Teng Long","Glen Choo"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"478936","messageId":"xmqqcz1gftdn.fsf@gitster.g","threadId":"59922","inReplyTo":null,"subject":"What's cooking in git.git (Jun 2023, #07; Tue, 27)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-06-27T22:11:16Z","receivedAt":"2023-06-27T22:11:28Z","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* jk/commit-use-no-divider-with-interpret-trailers (2023-06-16) 1 commit\n (merged to 'next' on 2023-06-20 at 08e5f2a6b5)\n + commit: pass --no-divider to interpret-trailers\n\n When \"git commit --trailer=...\" invokes the interpret-trailers\n machinery, it knows what it feeds to interpret-trailers is a full\n log message without any patch, but failed to express that by\n passing the \"--no-divider\" option, which has been corrected.\n source: <20230617042624.GA562686@coredump.intra.peff.net>\n\n\n* jk/redact-h2h3-headers-fix (2023-06-17) 1 commit\n (merged to 'next' on 2023-06-20 at c1247fd527)\n + http: handle both \"h2\" and \"h2h3\" in curl info lines\n\n Curl library recently changed how http2 traces are shown and broke\n the code to redact sensitive info header, which has been fixed.\n\n The GitHub Actions CI has been broken for recent macOS jobs, so\n this topic has been fast-tracked to help them.\n source: <20230617051559.GD562686@coredump.intra.peff.net>\n\n\n* tb/collect-pack-filenames-fix (2023-06-12) 1 commit\n (merged to 'next' on 2023-06-20 at abcc6892c8)\n + builtin/repack.c: only collect fully-formed packs\n\n Avoid breakage of \"git pack-objects --cruft\" due to inconsistency\n between the way the code enumerates packfiles in the repository.\n source: <20230607101617.ges6tnMry4E52lDGld43QgtNUsIS4YQq6w-t71hEfkQ@z>\n\n--------------------------------------------------\n[New Topics]\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: \n\n\n* tb/gc-recent-object-hook (2023-06-24) 1 commit\n (merged to 'next' on 2023-06-24 at e8c295841b)\n + t7701: make annotated tag unreachable\n\n Test update.\n\n Will merge to 'master'.\n source: <259b1b559114ab1a9a0bd7f1ad29a4cba2612ae0.1687617197.git.me@ttaylorr.com>\n\n\n* gc/config-context (2023-06-26) 12 commits\n - config: pass source to config_parser_event_fn_t\n - config: add kvi.path, use it to evaluate includes\n - config.c: remove config_reader from configsets\n - config: pass kvi to die_bad_number()\n - trace2: plumb config kvi\n - config.c: pass ctx with CLI config\n - builtin/config.c: test misuse of format_config()\n - config: pass ctx with config files\n - config.c: pass ctx in configsets\n - config: add ctx arg to config_fn_t\n - urlmatch.h: use config_fn_t type\n - config: inline git_color_default_config\n\n source: \n\n\n* gc/config-partial-submodule-kvi-fix (2023-06-26) 1 commit\n - config: don't BUG when both kvi and source are set\n\n source: \n\n\n* pw/apply-too-large (2023-06-26) 1 commit\n - apply: improve error messages when reading patch\n\n source: \n\n\n* pw/diff-no-index-from-named-pipes (2023-06-27) 3 commits\n . diff --no-index: support reading from named pipes\n . t4054: test diff --no-index with stdin\n . diff --no-index: die on error reading stdin\n\n source: \n\n--------------------------------------------------\n[Stalled]\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 Expecting a reroll.\n cf. \n source: \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 Expecting a reroll.\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= where\n the value can spell a Boolean in various ways. The support for the\n syntax is being dropped.\n\n Expecting a reroll.\n cf. \n source: \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 Expecting a hopefully minor and final reroll.\n cf. \n source: <20230120113553.24655-1-carenas@gmail.com>\n\n\n* tk/pull-conflict-suggest-rebase-merge-not-rebase-true (2023-02-13) 1 commit\n - pull: conflict hint pull.rebase suggestion should offer \"merges\" vs \"true\"\n\n In an advice message after failed non-ff pull, we used to suggest\n setting pull.rebase=true, but these days pull.rebase=merges may be\n more inline with the original spirit of \"rebuild your side on top\n of theirs\".\n\n May want to discard.\n This is too much of a departure from the existing practice.\n cf. \n cf. \n source: \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 source: \n\n\n* ad/test-record-count-when-harness-is-in-use (2022-12-25) 1 commit\n - test-lib: allow storing counts with test harnesses\n\n Allow summary results from tests to be written to t/test-results\n directory even when a test harness like 'prove' is in use.\n\n Expecting a reroll.\n cf. \n source: <20221224225200.1027806-1-adam@dinwoodie.org>\n\n\n* so/diff-merges-more (2022-12-18) 5 commits\n - diff-merges: improve --diff-merges documentation\n - diff-merges: issue warning on lone '-m' option\n - diff-merges: support list of values for --diff-merges\n - diff-merges: implement log.diffMerges-m-imply-p config\n - diff-merges: implement [no-]hide option and log.diffMergesHide config\n\n Assorted updates to \"--diff-merges=X\" option.\n\n May want to discard.\n Breaking compatibility does not seem worth it.\n source: <20221217132955.108542-1-sorganov@gmail.com>\n\n\n* ab/imap-send-requires-curl (2023-02-02) 6 commits\n - imap-send: correctly report \"host\" when using \"tunnel\"\n - imap-send: remove old --no-curl codepath\n - imap-send: make --curl no-optional\n - imap-send: replace auto-probe libcurl with hard dependency\n - imap-send doc: the imap.sslVerify is used with imap.tunnel\n - imap-send: note \"auth_method\", not \"host\" on auth method failure\n\n Give a hard dependency on cURL library to build \"git imap-send\",\n and remove the code to interact with IMAP server without using cURL.\n\n Expecting a reroll.\n The 'tunnel' part is still iffy.\n cf. <230203.86bkmabfjr.gmgdl@evledraar.gmail.com>\n source: \n\n\n* cw/submodule-status-in-parallel (2023-03-02) 6 commits\n - diff-lib: parallelize run_diff_files for submodules\n - diff-lib: refactor out diff_change logic\n - submodule: refactor is_submodule_modified()\n - submodule: move status parsing into function\n - submodule: rename strbuf variable\n - run-command: add on_stderr_output_fn to run_processes_parallel_opts\n\n \"git submodule status\" learned to run the comparison in submodule\n repositories in parallel.\n\n Expecting a reroll.\n cf. \n cf. <230307.865ybc273g.gmgdl@evledraar.gmail.com>\n source: <20230302215237.1473444-1-calvinwan@google.com>\n\n--------------------------------------------------\n[Cooking]\n\n* ds/remove-idx-before-pack (2023-06-20) 1 commit\n (merged to 'next' on 2023-06-23 at fa97bf0e41)\n + packfile: delete .idx files before .pack files\n\n We create .pack and then .idx, we consider only packfiles that have\n .idx usable (those with only .pack are not ready yet), so we should\n remove .idx before removing .pack for consistency.\n\n Will merge to 'master'.\n source: \n\n\n* bc/more-git-var (2023-06-27) 8 commits\n (merged to 'next' on 2023-06-27 at ea14687e91)\n + var: add config file locations\n + var: add attributes files locations\n + attr: expose and rename accessor functions\n + var: adjust memory allocation for strings\n + var: format variable structure with C99 initializers\n + var: add support for listing the shell\n + t: add a function to check executable bit\n + var: mark unused parameters in git_var callbacks\n<<\n* bc/more-git-var (2023-06-27) 8 commits\n . var: add config file locations\n . var: add attributes files locations\n . attr: expose and rename accessor functions\n . var: adjust memory allocation for strings\n . var: format variable structure with C99 initializers\n . var: add support for listing the shell\n . t: add a function to check executable bit\n . var: mark unused parameters in git_var callbacks\n>>\n\n Add more \"git var\" for toolsmiths to learn various locations Git is\n configured with either via the configuration or hardcoded defaults.\n\n Will merge to 'master'.\n source: <20230627161902.754472-1-sandals@crustytoothpaste.net>\n\n\n* jc/doc-hash-object-types (2023-06-23) 1 commit\n - docs: add git hash-object -t option's possible values\n\n Doc update.\n\n Will merge to 'next'.\n source: \n\n\n* jc/abort-ll-merge-with-a-signal (2023-06-23) 2 commits\n (merged to 'next' on 2023-06-24 at 685eb5d25c)\n + t6406: skip \"external merge driver getting killed by a signal\" test on Windows\n (merged to 'next' on 2023-06-23 at 9c9c37e95e)\n + ll-merge: killing the external merge driver aborts the merge\n\n When the external merge driver is killed by a signal, its output\n should not be trusted as a resolution with conflicts that is\n proposed by the driver, but the code did.\n\n Will merge to 'master'.\n source: \n\n\n* cc/repack-sift-filtered-objects-to-separate-pack (2023-06-14) 9 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=` option\n - repack: refactor finishing pack-objects command\n - repack: refactor piping an oid to a command\n - t/helper: add 'find-pack' test-tool\n - pack-objects: add `--print-filtered` to print omitted objects\n - pack-objects: allow `--filter` without `--stdout`\n\n \"git repack\" machinery learns to pay attention to the \"--filter=\"\n option.\n\n Needs review.\n source: <20230614192541.1599256-1-christian.couder@gmail.com>\n\n\n* ps/revision-stdin-with-options (2023-06-15) 3 commits\n (merged to 'next' on 2023-06-26 at eda3e4d0b5)\n + revision: handle pseudo-opts in `--stdin` mode\n + revision: small readability improvement for reading from stdin\n + revision: reorder `read_revisions_from_stdin()`\n\n The set-up code for the get_revision() API now allows feeding\n options like --all and --not in the --stdin mode.\n\n Will merge to 'master'.\n source: \n\n\n* rs/strbuf-expand-step (2023-06-18) 5 commits\n - strbuf: simplify strbuf_expand_literal_cb()\n - replace strbuf_expand() with strbuf_expand_step()\n - replace strbuf_expand_dict_cb() with strbuf_expand_step()\n - strbuf: factor out strbuf_expand_step()\n - pretty: factor out expand_separator()\n\n Code clean-up around strbuf_expand() API.\n\n Will merge to 'next'.\n source: <767baa64-20a6-daf2-d34b-d81f72363749@web.de>\n\n\n* js/doc-unit-tests (2023-06-13) 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 Comments? Filling in blanks?\n source: <8afdb215d7e10ca16a2ce8226b4127b3d8a2d971.1686352386.git.steadmon@google.com>\n\n\n* mh/mingw-case-sensitive-build (2023-06-12) 1 commit\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\n Needs review.\n source: <20230604211934.1365289-1-mh@glandium.org>\n\n\n* pb/complete-diff-options (2023-06-26) 24 commits\n - diff.c: mention completion above add_diff_options\n - completion: complete --remerge-diff\n - completion: complete --diff-merges, its options and --no-diff-merges\n - completion: move --pickaxe-{all,regex} to __git_diff_common_options\n - completion: complete --ws-error-highlight\n - completion: complete --unified\n - completion: complete --output-indicator-{context,new,old}\n - completion: complete --output\n - completion: complete --no-stat\n - completion: complete --no-relative\n - completion: complete --line-prefix\n - completion: complete --ita-invisible-in-index and --ita-visible-in-index\n - completion: complete --irreversible-delete\n - completion: complete --ignore-matching-lines\n - completion: complete --function-context\n - completion: complete --find-renames\n - completion: complete --find-object\n - completion: complete --find-copies\n - completion: complete --default-prefix\n - completion: complete --compact-summary\n - completion: complete --combined-all-paths\n - completion: complete --cc\n - completion: complete --break-rewrites\n - completion: add comments describing __git_diff_* globals\n\n Completion updates.\n\n Will merge to 'next'.\n source: \n\n\n* ks/ref-filter-signature (2023-06-06) 2 commits\n - ref-filter: add new \"signature\" atom\n - t/lib-gpg: introduce new prereq GPG2\n\n The \"git for-each-ref\" family of commands learned placeholders\n related to GPG signature verification.\n\n Needs review.\n source: <20230604185815.15761-1-five231003@gmail.com>\n\n\n* jt/path-filter-fix (2023-06-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. \n source: \n\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: \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: \n\n\n* tb/refs-exclusion-and-packed-refs (2023-06-20) 16 commits\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: let `for_each_namespaced_ref()` take excluded patterns\n - refs/packed-backend.c: ignore complicated hidden refs rules\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: \n\n\n* en/header-split-cache-h-part-3 (2023-06-21) 28 commits\n (merged to 'next' on 2023-06-23 at 84ad22bf36)\n + fsmonitor-ll.h: split this header out of fsmonitor.h\n + hash-ll, hashmap: move oidhash() to hash-ll\n + object-store-ll.h: split this header out of object-store.h\n + khash: name the structs that khash declares\n + merge-ll: rename from ll-merge\n + git-compat-util.h: remove unneccessary include of wildmatch.h\n + builtin.h: remove unneccessary includes\n + list-objects-filter-options.h: remove unneccessary include\n + diff.h: remove unnecessary include of oidset.h\n + repository: remove unnecessary include of path.h\n + log-tree: replace include of revision.h with simple forward declaration\n + cache.h: remove this no-longer-used header\n + read-cache*.h: move declarations for read-cache.c functions from cache.h\n + repository.h: move declaration of the_index from cache.h\n + merge.h: move declarations for merge.c from cache.h\n + diff.h: move declaration for global in diff.c from cache.h\n + preload-index.h: move declarations for preload-index.c from elsewhere\n + sparse-index.h: move declarations for sparse-index.c from cache.h\n + name-hash.h: move declarations for name-hash.c from cache.h\n + run-command.h: move declarations for run-command.c from cache.h\n + statinfo: move stat_{data,validity} functions from cache/read-cache\n + read-cache: move shared add/checkout/commit code\n + add: modify add_files_to_cache() to avoid globals\n + read-cache: move shared commit and ls-files code\n + setup: adopt shared init-db & clone code\n + init-db, clone: change unnecessary global into passed parameter\n + init-db: remove unnecessary global variable\n + init-db: document existing bug with core.bare in template config\n\n Header files cleanup.\n\n Will merge to 'master'.\n source: \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 source: <20230602102533.876905-1-christian.couder@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 Expecting a hopefully final reroll.\n Looking much better, except for minor cosmetic issues.\n source: <20230428083528.1699221-1-oswald.buddenhagen@gmx.de>\n\n\n* cw/strbuf-cleanup (2023-06-12) 7 commits\n - strbuf: remove global variable\n - path: move related function to path\n - object-name: move related functions to object-name\n - credential-store: move related functions to credential-store file\n - abspath: move related functions to abspath\n - strbuf: clarify dependency\n - strbuf: clarify API boundary\n\n Move functions that are not about pure string manipulation out of\n strbuf.[ch]\n\n Will merge to 'next'.\n source: <20230606194720.2053551-1-calvinwan@google.com>\n\n\n* tl/notes-separator (2023-06-21) 7 commits\n - notes: introduce \"--no-separator\" option\n - notes.c: introduce \"--[no-]stripspace\" option\n - notes.c: append separator instead of insert by pos\n - notes.c: introduce '--separator=' option\n - t3321: add test cases about the notes stripspace behavior\n - notes.c: use designated initializers for clarity\n - notes.c: cleanup 'strbuf_grow' call in 'append_edit'\n\n 'git notes append' was taught '--separator' to specify string to insert\n between paragraphs.\n source: \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 Expecting a reroll.\n cf. \n cf. <1fd54422-b66a-c2e4-7cd7-934ea01190ad@gmail.com>\n source: \n\n--------------------------------------------------\n[Discarded]\n\n* mh/credential-password-expiry-libsecret (2023-05-05) 1 commit\n . credential/libsecret: support password_expiry_utc\n\n Originally merged to 'next' on 2023-05-09\n\n The libsecret credential helper learns to handle the password\n expiry time information.\n\n Superseded by mh/credential-libsecret-attrs.\n cf. \n source: \n\n\n* tb/pack-bitmap-index-seek (2023-03-20) 6 commits\n . pack-bitmap.c: factor out `bitmap_index_seek_commit()`\n . pack-bitmap.c: use `bitmap_index_seek()` where possible\n . pack-bitmap.c: factor out manual `map_pos` manipulation\n . pack-bitmap.c: drop unnecessary 'inline's\n . pack-bitmap.c: hide bitmap internals in `read_be32()`\n . pack-bitmap.c: hide bitmap internals in `read_u8()`\n\n Clean-up the pack-bitmap codepath.\n\n Retracted for now.\n cf. \n source: \n\n\n* js/cmake-wo-cache-h (2023-06-15) 1 commit\n . cmake: adapt to `cache.h` being no more\n\n Build fix in en/header-split-cache-h-part-3 topic.\n\n Ejected out of 'next' and made into a part of en/header-split-cache-h-part-3\n source: \n\n\n* jc/notes-separator-fix (2023-06-13) 7 commits\n . notes: do not access before the beginning of an array\n\n Fix to tl/notes-separator topic.\n\n Discarded as the updated base topic should not require it anymore.\n source: \n"},{"id":"478953","messageId":"20230628095421.7249-1-tenglong.tl@alibaba-inc.com","threadId":"59922","inReplyTo":"xmqqcz1gftdn.fsf@gitster.g","subject":"What's cooking in git.git (Jun 2023, #07; Tue, 27)","fromName":"Teng Long","fromEmail":"dyroneteng@gmail.com","sentAt":"2023-06-28T09:54:21Z","receivedAt":"2023-06-28T10:06:39Z","isPatch":false,"sender":{"key":"dyroneteng@gmail.com","avatar":"https://avatars.githubusercontent.com/u/7803958?v=4"},"body":"Junio C Hamano writes:\n\n> * tl/notes-separator (2023-06-21) 7 commits\n> - notes: introduce \"--no-separator\" option\n> - notes.c: introduce \"--[no-]stripspace\" option\n> - notes.c: append separator instead of insert by pos\n> - notes.c: introduce '--separator=' option\n> - t3321: add test cases about the notes stripspace behavior\n> - notes.c: use designated initializers for clarity\n> - notes.c: cleanup 'strbuf_grow' call in 'append_edit'\n> \n> 'git notes append' was taught '--separator' to specify string to insert\n> between paragraphs.\n> source: \n\nThere are no pending issues I think ;-)\n\nPlease let me know if there are some obstables to merge.\n\nThanks.\n"},{"id":"478960","messageId":"xmqqjzvneer9.fsf@gitster.g","threadId":"59922","inReplyTo":"20230628095421.7249-1-tenglong.tl@alibaba-inc.com","subject":"Re: What's cooking in git.git (Jun 2023, #07; Tue, 27)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-06-28T16:24:42Z","receivedAt":"2023-06-28T16:24:59Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Teng Long writes:\n\n> Junio C Hamano writes:\n>\n>> * tl/notes-separator (2023-06-21) 7 commits\n>> - notes: introduce \"--no-separator\" option\n>> - notes.c: introduce \"--[no-]stripspace\" option\n>> - notes.c: append separator instead of insert by pos\n>> - notes.c: introduce '--separator=' option\n>> - t3321: add test cases about the notes stripspace behavior\n>> - notes.c: use designated initializers for clarity\n>> - notes.c: cleanup 'strbuf_grow' call in 'append_edit'\n>> \n>> 'git notes append' was taught '--separator' to specify string to insert\n>> between paragraphs.\n>> source: \n>\n> There are no pending issues I think ;-)\n>\n> Please let me know if there are some obstables to merge.\n\nYes, please do (this is not a message to Teng, but to others) ;-)\n\nThanks.\n"},{"id":"478985","messageId":"kl6lh6qrqtbj.fsf@chooglen-macbookpro.roam.corp.google.com","threadId":"59922","inReplyTo":"xmqqcz1gftdn.fsf@gitster.g","subject":"cw/header-compat-util-shuffle (was Re: What's cooking in git.git (Jun 2023, #07; Tue, 27))","fromName":"Glen Choo","fromEmail":"chooglen@google.com","sentAt":"2023-06-28T19:29:20Z","receivedAt":"2023-06-28T19:30:36Z","isPatch":false,"sender":{"key":"glencbz@gmail.com","avatar":"https://avatars.githubusercontent.com/u/58092771?v=4"},"body":"I notice that\n\n https://lore.kernel.org/git/20230606170711.912972-1-calvinwan@google.com/\n\nis available as cw/header-compat-util-shuffle, but AFAICT that's not in\nthis announcement or 'seen'.\n"},{"id":"478991","messageId":"xmqqbkgzcnao.fsf@gitster.g","threadId":"59922","inReplyTo":"kl6lh6qrqtbj.fsf@chooglen-macbookpro.roam.corp.google.com","subject":"Re: cw/header-compat-util-shuffle (was Re: What's cooking in git.git (Jun 2023, #07; Tue, 27))","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-06-28T21:03:11Z","receivedAt":"2023-06-28T21:03:19Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Glen Choo writes:\n\n> I notice that\n>\n> https://lore.kernel.org/git/20230606170711.912972-1-calvinwan@google.com/\n>\n> is available as cw/header-compat-util-shuffle, but AFAICT that's not in\n> this announcement or 'seen'.\n\nYes, I have found that it had too many bad interactions with topics\nin flight and, keeping it out of 'seen' was very much deliberate.\n\nThanks.\n\n"},{"id":"478994","messageId":"kl6ledlvqo94.fsf@chooglen-macbookpro.roam.corp.google.com","threadId":"59922","inReplyTo":"xmqqbkgzcnao.fsf@gitster.g","subject":"Re: cw/header-compat-util-shuffle (was Re: What's cooking in git.git (Jun 2023, #07; Tue, 27))","fromName":"Glen Choo","fromEmail":"chooglen@google.com","sentAt":"2023-06-28T21:18:47Z","receivedAt":"2023-06-28T21:23:46Z","isPatch":false,"sender":{"key":"glencbz@gmail.com","avatar":"https://avatars.githubusercontent.com/u/58092771?v=4"},"body":"Junio C Hamano writes:\n\n> Glen Choo writes:\n>\n>> I notice that\n>>\n>> https://lore.kernel.org/git/20230606170711.912972-1-calvinwan@google.com/\n>>\n>> is available as cw/header-compat-util-shuffle, but AFAICT that's not in\n>> this announcement or 'seen'.\n>\n> Yes, I have found that it had too many bad interactions with topics\n> in flight and, keeping it out of 'seen' was very much deliberate.\n\nThanks, that makes sense.\n\nPerhaps it should still get a call out in What's Cooking? When Calvin\nreferenced that series, I went digging in What's Cooking for the topic\nname, and when I couldn't find it, I manually listed the topic branches\nstarting with \"cw/\"; fortunately, Calvin's contribution history is short\nenough to make that tenable ;)\n"},{"id":"478997","messageId":"xmqqilb7b4mp.fsf@gitster.g","threadId":"59922","inReplyTo":"kl6ledlvqo94.fsf@chooglen-macbookpro.roam.corp.google.com","subject":"Re: cw/header-compat-util-shuffle (was Re: What's cooking in git.git (Jun 2023, #07; Tue, 27))","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-06-28T22:31:42Z","receivedAt":"2023-06-28T22:31:53Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Glen Choo writes:\n\n>> Yes, I have found that it had too many bad interactions with topics\n>> in flight and, keeping it out of 'seen' was very much deliberate.\n>\n> Thanks, that makes sense.\n>\n> Perhaps it should still get a call out in What's Cooking? When Calvin\n> referenced that series, I went digging in What's Cooking for the topic\n> name, and when I couldn't find it, I manually listed the topic branches\n> starting with \"cw/\"; fortunately, Calvin's contribution history is short\n> enough to make that tenable ;)\n\nMaybe.\n\nAs I only have limited bandwidth, I do not know how stale the posted\nversion got since other topics in flight also moved. It may be that\nother topics have graduated to 'master' and the conflicts got even\nworse but it can be easier to resurrect on top of updated 'master'.\nOr other topics that had interactions somehow magically stopped\nbeing conflicting. Or the series by itself may have remaining\nissues pointed out during the review and is not ready to be picked\nup. I truly do not know. Sorry.\n\nOne thing that many contributors are doing, which is very much\nappreciated, is make sure that the series they are going to post\nwould work well with at least the tip of 'next' and also with\n'seen', as well as 'master', before sending them out. It would help\neverybody: those who own topics that the series interacts with, the\nmaintainer, and those who may want to build on top of what the\nseries adds.\n\nIf the topic is too disruptive, however, they may have to synthesize\na good base (i.e. \"merge on top of 'master' topics A, B and C, and\nthen queue these patches\") but it may not be possible (e.g. among\nthe topics it interacts with, some topic may not yet be stable to\nbuild on), in which case they must catch up quickly every time these\nother topics it depends on are updated to avoid being left behind.\n\nIf the contributor cannot afford the time for quicker turnaround\nthat way, it would very much help everybody to announce that they\ntentatively withdraw the topic until the other topics get more\nstable, after which time they will send an updated version. It\nwill help everybody, including those who want to build on top of\nwhat the series adds.\n\nThanks.\n"},{"id":"478998","messageId":"xmqqedlvb3wb.fsf@gitster.g","threadId":"59922","inReplyTo":"xmqqilb7b4mp.fsf@gitster.g","subject":"Re: cw/header-compat-util-shuffle (was Re: What's cooking in git.git (Jun 2023, #07; Tue, 27))","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-06-28T22:47:32Z","receivedAt":"2023-06-28T22:51:07Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n> If the topic is too disruptive, however, they may have to synthesize\n> a good base (i.e. \"merge on top of 'master' topics A, B and C, and\n> then queue these patches\") but it may not be possible (e.g. among\n> the topics it interacts with, some topic may not yet be stable to\n> build on), in which case they must catch up quickly every time these\n> other topics it depends on are updated to avoid being left behind.\n>\n> If the contributor cannot afford the time for quicker turnaround\n> that way, it would very much help everybody to announce that they\n> tentatively withdraw the topic until the other topics get more\n> stable, after which time they will send an updated version. It\n> will help everybody, including those who want to build on top of\n> what the series adds.\n\nOh, another thing. Such a contributor who is blocked by topics by\nothers can help their own series by helping these other topics get\npolished, i.e. with additional reviews, additional test reports,\netc.\n\n"},{"id":"479000","messageId":"xmqqttur9m1a.fsf@gitster.g","threadId":"59922","inReplyTo":"xmqqcz1gftdn.fsf@gitster.g","subject":"Re: What's cooking in git.git (Jun 2023, #07; Tue, 27)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-06-28T23:58:41Z","receivedAt":"2023-06-28T23:59:27Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Summary of updates from today's integration cycle.\n\n> * gc/config-context (2023-06-26) 12 commits\n> ...\n> source: \n\nThis is now in 'next', hopefully in 'master' in a week.\n\n> * gc/config-partial-submodule-kvi-fix (2023-06-26) 1 commit\n> ...\n> source: \n\nThis is now in 'next', hopefully in 'master' in a week.\n\n> * pw/apply-too-large (2023-06-26) 1 commit\n> ...\n> source: \n\nWill merge to 'next'.\n\n> * pw/diff-no-index-from-named-pipes (2023-06-27) 3 commits\n> ...\n> source: \n\nExpecting a reroll.\n\n> * jc/doc-hash-object-types (2023-06-23) 1 commit\n> ...\n> source: \n\nExpecting a hopefully minor and final reroll.\n\n> * rs/strbuf-expand-step (2023-06-18) 5 commits\n> ...\n> source: <767baa64-20a6-daf2-d34b-d81f72363749@web.de>\n\nNow in 'next'.\n\n> * pb/complete-diff-options (2023-06-26) 24 commits\n> ...\n> source: \n\nNow in 'next'.\n\n> * cw/strbuf-cleanup (2023-06-12) 7 commits\n> ...\n> source: <20230606194720.2053551-1-calvinwan@google.com>\n\nNow in 'next'.\n\n> * tl/notes-separator (2023-06-21) 7 commits\n> ...\n> source: \n\nWill merge to 'next'.\n"}]}