{"thread":{"id":"58053","subject":"What's cooking in git.git (Jun 2022, #07; Wed, 22)","startedAt":"2022-06-22T19:34:07Z","lastAt":"2022-06-27T18:34:36Z","messageCount":13,"participants":["Junio C Hamano","Elijah Newren","Johannes Schindelin","Ævar Arnfjörð Bjarmason","Glen Choo"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"457741","messageId":"xmqq7d584hqb.fsf@gitster.g","threadId":"58053","inReplyTo":null,"subject":"What's cooking in git.git (Jun 2022, #07; Wed, 22)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-06-22T19:32:12Z","receivedAt":"2022-06-22T19:34:07Z","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',\nand aren't considered \"accepted\" at all.\n\nGit 2.37-rc2 has been tagged.  Due to summer vacation season in the\nnorthern hemisphere, this cycle is shorter than usual.  We expect to\ntag the final 2.37 release early next week.  Hopefully we fixed all\nthe known regressions in 2.36 without adding too many new ones.\n\nSome new topics are still marked for 'next', but the merges of them\nobviously will happen in the next cycle---they will not be in the\nupcoming release.\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[New Topics]\n\n* dr/i18n-die-warn-error-usage (2022-06-21) 1 commit\n - i18n: mark message helpers prefix for translation\n\n Give _() markings to fatal/warning/usage: that is shown in front of\n these messages.\n\n Will merge to 'next'?\n source: <pull.1279.v2.git.git.1655819877758.gitgitgadget@gmail.com>\n\n\n* ds/t5510-brokequote (2022-06-21) 1 commit\n - t5510: replace 'origin' with URL more carefully\n\n Test fix.\n source: <484a330e-0902-6e1b-8189-63c72dcea494@github.com>\n\n\n* en/merge-restore-to-pristine (2022-06-21) 6 commits\n - merge: do not exit restore_state() prematurely\n - merge: ensure we can actually restore pre-merge state\n - merge: make restore_state() restore staged state too\n - merge: fix save_state() to work when there are racy-dirty files\n - merge: remove unused variable\n - t6424: make sure a failed merge preserves local changes\n\n When \"git merge\" finds that it cannot perform a merge, it should\n restore the working tree to the state before the command was\n initiated, but in some corner cases it didn't.\n\n Needs review.\n source: <pull.1231.v2.git.1655621424.gitgitgadget@gmail.com>\n\n\n* rs/combine-diff-with-incompatible-options (2022-06-21) 2 commits\n - combine-diff: abort if --output is given\n - combine-diff: abort if --ignore-matching-lines is given\n\n Certain diff options are currently ignored when combined-diff is\n shown; mark them as incompatible with the feature.\n\n Will merge to 'next'?\n source: <220524.86v8tuvfl1.gmgdl@evledraar.gmail.com>\n\n\n* tk/apply-case-insensitive (2022-06-21) 3 commits\n - apply: support case-only renames in case-insensitive filesystems\n - reset: new failing test for reset of case-insensitive duplicate in index\n - t4141: test \"git apply\" with core.ignorecase\n\n \"git apply\" barfed on a patch that makes a case-only rename on a\n case-insensitive filesystem.\n\n Needs review.\n source: <pull.1257.v2.git.1655655027.gitgitgadget@gmail.com>\n\n\n* zh/ls-files-format (2022-06-21) 1 commit\n - ls-files: introduce \"--format\" option\n\n \"git ls-files\" learns the \"--format\" option to tweak its output.\n\n Needs review.\n source: <pull.1262.v3.git.1655777140231.gitgitgadget@gmail.com>\n\n\n* ab/test-quoting-fix (2022-06-21) 3 commits\n - config tests: fix harmless but broken \"rm -r\" cleanup\n - test-lib.sh: fix prepend_var() quoting issue\n - tests: add missing double quotes to included library paths\n\n Fixes for tests when the source directory has unusual characters in\n its path, e.g. whitespaces, double-quotes, etc.\n\n Expecting a reroll.\n source: <cover-0.3-00000000000-20220621T221928Z-avarab@gmail.com>\n\n\n* en/merge-dual-dir-renames-fix (2022-06-21) 3 commits\n - merge-ort: fix issue with dual rename and add/add conflict\n - merge-ort: shuffle the computation and cleanup of potential collisions\n - t6423: add tests of dual directory rename plus add/add conflict\n\n Fixes a long-standing corner case bug around directory renames in\n the merge-ort strategy.\n\n Needs review.\n source: <pull.1268.git.1655871651.gitgitgadget@gmail.com>\n\n--------------------------------------------------\n[Graduated to 'master']\n\n* jp/prompt-clear-before-upstream-mark (2022-06-10) 2 commits\n  (merged to 'next' on 2022-06-15 at e580db03e9)\n + git-prompt: fix expansion of branch colour codes\n  (merged to 'next' on 2022-06-08 at 201a84ad63)\n + git-prompt: make colourization consistent\n\n Bash command line prompt (in contrib/) update.\n source: <20220607115024.64724-1-joak-pet@online.no>\n\n\n* tb/cruft-packs (2022-06-21) 1 commit\n  (merged to 'next' on 2022-06-21 at 0703251124)\n + gc: simplify --cruft description\n\n Docfix.\n source: <157741e2-cd06-9304-bb21-c67c2cbd923e@web.de>\n\n--------------------------------------------------\n[Stalled]\n\n* en/merge-tree (2022-02-23) 13 commits\n - git-merge-tree.txt: add a section on potentional usage mistakes\n - merge-tree: add a --allow-unrelated-histories flag\n - merge-tree: allow `ls-files -u` style info to be NUL terminated\n - merge-tree: provide easy access to `ls-files -u` style info\n - merge-tree: provide a list of which files have conflicts\n - merge-ort: provide a merge_get_conflicted_files() helper function\n - merge-tree: support including merge messages in output\n - merge-ort: split out a separate display_update_messages() function\n - merge-tree: implement real merges\n - merge-tree: add option parsing and initial shell for real merge function\n - merge-tree: move logic for existing merge into new function\n - merge-tree: rename merge_trees() to trivial_merge_trees()\n - Merge branch 'en/remerge-diff' into en/merge-trees\n\n A new command is introduced that takes two commits and computes a\n tree that would be contained in the resulting merge commit, if the\n histories leading to these two commits were to be merged, and is\n added as a new mode of \"git merge-tree\" subcommand.\n\n On hold.\n cf. <CABPp-BGZ7OAYRR5YKRsxJSo-C=ho+qcNAkqwkim8CkhCfCeHsA@mail.gmail.com>\n source: <pull.1122.v6.git.1645602413.gitgitgadget@gmail.com>\n\n\n* bc/stash-export (2022-04-08) 4 commits\n - builtin/stash: provide a way to import stashes from a ref\n - builtin/stash: provide a way to export stashes to a ref\n - builtin/stash: factor out revision parsing into a function\n - object-name: make get_oid quietly return an error\n\n A mechanism to export and import stash entries to and from a normal\n commit to transfer it across repositories has been introduced.\n\n Expecting a reroll.\n cf. <YnL2d4Vr9Vr7W4Hj@camp.crustytoothpaste.net>\n source: <20220407215352.3491567-1-sandals@crustytoothpaste.net>\n\n\n* cw/remote-object-info (2022-05-06) 11 commits\n - SQUASH??? coccicheck\n - SQUASH??? ensure that coccicheck is happy\n - SQUASH??? compilation fix\n - cat-file: add --batch-command remote-object-info command\n - cat-file: move parse_cmd and DEFAULT_FORMAT up\n - transport: add object-info fallback to fetch\n - transport: add client side capability to request object-info\n - object-info: send attribute packet regardless of object ids\n - object-store: add function to free object_info contents\n - fetch-pack: move fetch default settings\n - fetch-pack: refactor packet writing\n\n A client component to talk with the object-info endpoint.\n\n Expecting a reroll.\n source: <20220502170904.2770649-1-calvinwan@google.com>\n\n--------------------------------------------------\n[Cooking]\n\n* cr/setup-bug-typo (2022-06-17) 1 commit\n  (merged to 'next' on 2022-06-17 at 8834ffe0ab)\n + setup: fix function name in a BUG() message\n\n Typofix in a BUG() message.\n\n Will cook in 'next'.\n source: <pull.1255.git.1654782920256.gitgitgadget@gmail.com>\n\n\n* zk/push-use-bitmaps (2022-06-17) 1 commit\n - send-pack.c: add config push.useBitmaps\n\n \"git push\" sometimes perform poorly when reachability bitmaps are\n used, even in a repository where other operations are helped by\n bitmaps.  The push.useBitmaps configuration variable is introduced\n to allow disabling use of reachability bitmaps only for \"git push\".\n\n Will merge to 'next'?\n source: <pull.1263.v4.git.1655492779228.gitgitgadget@gmail.com>\n\n\n* jk/remote-show-with-negative-refspecs (2022-06-17) 1 commit\n - remote: handle negative refspecs in git remote show\n (this branch is used by jk/t5505-restructure.)\n\n \"git remote show [-n] frotz\" now pays attention to negative\n pathspecs.\n\n Will merge to 'next'?\n source: <20220617002036.1577-2-jacob.keller@gmail.com>\n\n\n* js/commit-graph-parsing-without-repo-settings (2022-06-15) 1 commit\n - commit-graph: refactor to avoid prepare_repo_settings\n\n source: <9b56496b0809cc8a25af877ea97042e2cb7f2af6.1655246092.git.steadmon@google.com>\n\n\n* jk/optim-promisor-object-enumeration (2022-06-16) 1 commit\n  (merged to 'next' on 2022-06-16 at ce0712a74c)\n + is_promisor_object(): walk promisor packs in pack-order\n\n Collection of what is referenced by objects in promisor packs have\n been optimized to inspect these objects in the in-pack order.\n\n Will cook in 'next'.\n source: <YqrTsbXbEjx0Pabn@coredump.intra.peff.net>\n\n\n* ro/mktree-allow-missing-fix (2022-06-21) 1 commit\n - mktree: do not check type of remote objects\n\n \"git mktree --missing\" lazily fetched objects that are missing from\n the local object store, which was totally unnecessary.\n\n Will merge to 'next'?\n source: <748f39a9-65aa-2110-cf92-7ddf81b5f507@roku.com>\n\n\n* ll/curl-accept-language (2022-06-13) 2 commits\n - PREP??? give initializer to rpc_state\n - remote-curl: send Accept-Language header to server\n\n source: <pull.1251.v3.git.1655054421697.gitgitgadget@gmail.com>\n\n\n* pb/diff-doc-raw-format (2022-06-13) 3 commits\n - diff-index.txt: update raw output format in examples\n - diff-format.txt: correct misleading wording\n - diff-format.txt: dst can be 0* SHA-1 when path is deleted, too\n\n source: <pull.1259.git.1655123383.gitgitgadget@gmail.com>\n\n\n* rs/archive-with-internal-gzip (2022-06-15) 6 commits\n  (merged to 'next' on 2022-06-17 at ab5af6acd1)\n + archive-tar: use internal gzip by default\n + archive-tar: use OS_CODE 3 (Unix) for internal gzip\n + archive-tar: add internal gzip implementation\n + archive-tar: factor out write_block()\n + archive: rename archiver data field to filter_command\n + archive: update format documentation\n\n Teach \"git archive\" to (optionally and then by default) avoid\n spawning an external \"gzip\" process when creating \".tar.gz\" (and\n \".tgz\") archives.\n\n Will cook in 'next'.\n source: <9df761c3-355a-ede9-7971-b32687fe9abb@web.de>\n\n\n* ds/branch-checked-out (2022-06-21) 7 commits\n  (merged to 'next' on 2022-06-21 at e42bc4566f)\n + branch: drop unused worktrees variable\n + fetch: stop passing around unused worktrees variable\n  (merged to 'next' on 2022-06-17 at c881874257)\n + branch: fix branch_checked_out() leaks\n + branch: use branch_checked_out() when deleting refs\n + fetch: use new branch_checked_out() and add tests\n + branch: check for bisects and rebases\n + branch: add branch_checked_out() helper\n\n Introduce a helper to see if a branch is already being worked on\n (hence should not be newly checked out in a working tree), which\n performs much better than the existing find_shared_symref() to\n replace many uses of the latter.\n\n Will cook in 'next'.\n source: <pull.1254.v2.git.1655234853.gitgitgadget@gmail.com>\n\n\n* jt/connected-show-missing-from-which-side (2022-06-10) 1 commit\n - fetch,fetch-pack: clarify connectivity check error\n\n We may find an object missing after a \"git fetch\" stores the\n objects it obtained from the other side, but it is not necessarily\n because the remote failed to send necessary objects.  Reword the\n messages in an attempt to help users explore other possibilities\n when they hit this error.\n\n Expecting a reroll.\n source: <20220610195247.1177549-1-jonathantanmy@google.com>\n\n\n* gc/submodule-update (2022-06-15) 12 commits\n - git-sh-setup.sh: remove \"say\" function, change last users\n - git-submodule.sh: use \"$quiet\", not \"$GIT_QUIET\"\n - submodule--helper: eliminate internal \"--update\" option\n - submodule--helper: understand --checkout, --merge and --rebase synonyms\n - submodule--helper: report \"submodule\" as our name in \"-h\" output\n - submodule--helper: rename \"absorb-git-dirs\" to \"absorbgitdirs\"\n - submodule update: remove \"-v\" option\n - submodule--helper: have --require-init imply --init\n - git-submodule.sh: remove unused top-level \"--branch\" argument\n - git-submodule.sh: make \"$cached\" variable a boolean\n - git-submodule.sh: remove unused $prefix var and --super-prefix\n - git-submodule.sh: remove unused sanitize_submodule_env()\n\n More work on \"git submodule update\".\n\n Needs review.\n source: <cover-v2-00.12-00000000000-20220613T220150Z-avarab@gmail.com>\n\n\n* jc/resolve-undo (2022-06-09) 1 commit\n  (merged to 'next' on 2022-06-15 at c195e5a2d9)\n + revision: mark blobs needed for resolve-undo as reachable\n\n The resolve-undo information in the index was not protected against\n GC, which has been corrected.\n\n Will cook in 'next'.\n source: <xmqqfskdieqz.fsf@gitster.g>\n\n\n* ab/build-gitweb (2022-06-02) 7 commits\n - Makefile: build 'gitweb' in the default target\n - gitweb/Makefile: include in top-level Makefile\n - gitweb: remove \"test\" and \"test-installed\" targets\n - gitweb/Makefile: prepare to merge into top-level Makefile\n - gitweb/Makefile: clear up and de-duplicate the gitweb.{css,js} vars\n - gitweb/Makefile: add a $(GITWEB_ALL) variable\n - gitweb/Makefile: define all .PHONY prerequisites inline\n\n Teach \"make all\" to build gitweb as well.\n\n Needs review.\n source: <cover-v2-0.7-00000000000-20220531T173805Z-avarab@gmail.com>\n\n\n* ab/test-without-templates (2022-06-06) 7 commits\n - tests: don't assume a .git/info for .git/info/sparse-checkout\n - tests: don't assume a .git/info for .git/info/exclude\n - tests: don't assume a .git/info for .git/info/refs\n - tests: don't assume a .git/info for .git/info/attributes\n - tests: don't assume a .git/info for .git/info/grafts\n - tests: don't depend on template-created .git/branches\n - t0008: don't rely on default \".git/info/exclude\"\n\n Tweak tests so that they still work when the \"git init\" template\n did not create .git/info directory.\n\n Will merge to 'next'?\n source: <cover-v2-0.7-00000000000-20220603T110506Z-avarab@gmail.com>\n\n\n* ac/bitmap-format-doc (2022-06-16) 3 commits\n  (merged to 'next' on 2022-06-16 at 5591d11601)\n + bitmap-format.txt: add information for trailing checksum\n + bitmap-format.txt: fix some formatting issues\n + bitmap-format.txt: feed the file to asciidoc to generate html\n\n Adjust technical/bitmap-format to be formatted by AsciiDoc, and\n add some missing information to the documentation.\n\n Will cook in 'next'.\n source: <pull.1246.v4.git.1655355834.gitgitgadget@gmail.com>\n\n\n* hx/unpack-streaming (2022-06-13) 6 commits\n - unpack-objects: use stream_loose_object() to unpack large objects\n - core doc: modernize core.bigFileThreshold documentation\n - object-file.c: add \"stream_loose_object()\" to handle large object\n - object-file.c: factor out deflate part of write_loose_object()\n - object-file.c: refactor write_loose_object() to several steps\n - unpack-objects: low memory footprint for get_data() in dry_run mode\n\n Allow large objects read from a packstream to be streamed into a\n loose object file straight, without having to keep it in-core as a\n whole.\n\n Will merge to 'next'?\n source: <cover.1654914555.git.chiyutianyi@gmail.com>\n\n\n* tb/show-ref-count (2022-06-06) 2 commits\n - builtin/show-ref.c: limit output with `--count`\n - builtin/show-ref.c: rename `found_match` to `matches_nr`\n\n \"git show-ref\" learned to stop after emitting N refs with the new\n \"--count=N\" option.\n\n Expecting a reroll.\n cf. <xmqqczfl4ce1.fsf@gitster.g>\n source: <cover.1654552560.git.me@ttaylorr.com>\n\n\n* ds/bundle-uri-more (2022-06-06) 6 commits\n - fetch: add 'refs/bundle/' to log.excludeDecoration\n - bundle-uri: add support for http(s):// and file://\n - fetch: add --bundle-uri option\n - bundle-uri: create basic file-copy logic\n - remote-curl: add 'get' capability\n - docs: document bundle URI standard\n\n The \"bundle URI\" topic.\n\n Needs review.\n source: <pull.1248.git.1654545325.gitgitgadget@gmail.com>\n\n\n* js/bisect-in-c (2022-05-21) 15 commits\n - bisect: no longer try to clean up left-over `.git/head-name` files\n - bisect: remove Cogito-related code\n - Turn `git bisect` into a full built-in\n - bisect: teach the `bisect--helper` command to show the correct usage strings\n - bisect: move even the command-line parsing to `bisect--helper`\n - bisect--helper: return only correct exit codes in `cmd_*()`\n - bisect--helper: move the `BISECT_STATE` case to the end\n - bisect--helper: make `--bisect-state` optional\n - bisect--helper: align the sub-command order with git-bisect.sh\n - bisect--helper: using `--bisect-state` without an argument is a bug\n - bisect--helper: really retire `--bisect-autostart`\n - bisect--helper: really retire --bisect-next-check\n - bisect--helper: retire the --no-log option\n - bisect: avoid double-quoting when printing the failed command\n - bisect run: fix the error message\n\n Final bits of \"git bisect.sh\" have been rewritten in C.\n\n The command line parsing is reported to be still broken.\n cf. <220521.86zgjazuy4.gmgdl@evledraar.gmail.com>\n source: <pull.1132.v3.git.1653144546.gitgitgadget@gmail.com>\n\n\n* gc/bare-repo-discovery (2022-06-07) 5 commits\n - setup.c: create `discovery.bare`\n - safe.directory: use git_protected_config()\n - config: read protected config with `git_protected_config()`\n - Documentation: define protected configuration\n - Documentation/git-config.txt: add SCOPES section\n\n Introduce a discovery.barerepository configuration variable that\n allows users to forbid discovery of bare repositories.\n\n Expecting a reroll.\n cf. <xmqqbkv4t7gp.fsf@gitster.g>\n source: <29053d029f8ec61095a2ad557be38b1d485a158f.1654635432.git.gitgitgadget@gmail.com>\n\n\n* gg/worktree-from-the-above (2022-06-21) 2 commits\n - dir: minor refactoring / clean-up\n - dir: traverse into repository\n\n With a non-bare repository, with core.worktree pointing at a\n directory that has the repository as its subdirectory, regressed in\n Git 2.27 days.\n\n Will merge to 'next'.\n source: <20220616234433.225-1-gg.oss@outlook.com>\n source: <20220616231956.154-1-gg.oss@outlook.com>\n\n\n* ar/send-email-confirm-by-default (2022-04-22) 1 commit\n - send-email: always confirm by default\n\n \"git send-email\" is changed so that by default it asks for\n confirmation before sending each message out.\n\n Will discard.\n\n I wanted to like this, and had it in the version of Git I use\n myself for daily work, but the prompting turned out to be somewhat\n distracting.\n\n Thoughts?\n source: <20220422083629.1404989-1-hi@alyssa.is>\n\n--------------------------------------------------\n[Discarded]\n\n* jc/apply-icase-tests (2022-06-13) 1 commit\n . t4141: test \"git apply\" with core.ignorecase\n\n Now a part of tk/apply-case-insensitive topic.\n source: <xmqqo7yw77qo.fsf@gitster.g>\n\n\n* tl/pack-bitmap-trace (2022-06-21) 5 commits\n . bitmap: add trace2 outputs during open \"bitmap\" file\n . pack-bitmap.c: using error() instead of silently returning -1\n . pack-bitmap.c: make warnings support i18N when opening bitmap\n . pack-bitmap.c: rename \"idx_name\" to \"bitmap_name\"\n . pack-bitmap.c: continue looping when first MIDX bitmap is found\n\n Add trace2 traces in code paths involving the pack bitmaps.\n\n source: <cover.1655817253.git.dyroneteng@gmail.com>\n\n\n"},{"id":"457747","messageId":"CABPp-BGGDvZ40TY939fFM0xPZuaogPS+ymfEpc+hv-sJnO8Jcg@mail.gmail.com","threadId":"58053","inReplyTo":"xmqq7d584hqb.fsf@gitster.g","subject":"en/merge-tree (Was: Re: What's cooking in git.git (Jun 2022, #07; Wed, 22))","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2022-06-22T21:16:28Z","receivedAt":"2022-06-22T21:16:44Z","isPatch":false,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"On Wed, Jun 22, 2022 at 12:41 PM Junio C Hamano <gitster@pobox.com> wrote:\n> [Stalled]\n>\n> * en/merge-tree (2022-02-23) 13 commits\n>  - git-merge-tree.txt: add a section on potentional usage mistakes\n>  - merge-tree: add a --allow-unrelated-histories flag\n>  - merge-tree: allow `ls-files -u` style info to be NUL terminated\n>  - merge-tree: provide easy access to `ls-files -u` style info\n>  - merge-tree: provide a list of which files have conflicts\n>  - merge-ort: provide a merge_get_conflicted_files() helper function\n>  - merge-tree: support including merge messages in output\n>  - merge-ort: split out a separate display_update_messages() function\n>  - merge-tree: implement real merges\n>  - merge-tree: add option parsing and initial shell for real merge function\n>  - merge-tree: move logic for existing merge into new function\n>  - merge-tree: rename merge_trees() to trivial_merge_trees()\n>  - Merge branch 'en/remerge-diff' into en/merge-trees\n>\n>  A new command is introduced that takes two commits and computes a\n>  tree that would be contained in the resulting merge commit, if the\n>  histories leading to these two commits were to be merged, and is\n>  added as a new mode of \"git merge-tree\" subcommand.\n>\n>  On hold.\n>  cf. <CABPp-BGZ7OAYRR5YKRsxJSo-C=ho+qcNAkqwkim8CkhCfCeHsA@mail.gmail.com>\n>  source: <pull.1122.v6.git.1645602413.gitgitgadget@gmail.com>\n\nCan you update from \"On hold\" to \"new patchset exists\" (new source:\n<pull.1122.v7.git.1655511660.gitgitgadget@gmail.com>) and move it out\nfrom the stalled section?\n\n(Also, FWIW, v7 was collaborative effort between Dscho and I, and\nwe're now finally both pretty happy with the state of the patches, as\nnoted over at https://lore.kernel.org/git/CABPp-BFfRGQybYManC6LfFTaAd3mweBxL=APCGP_vRF-WQxGSw@mail.gmail.com/).\n"},{"id":"457753","messageId":"xmqqk0982swq.fsf@gitster.g","threadId":"58053","inReplyTo":"CABPp-BGGDvZ40TY939fFM0xPZuaogPS+ymfEpc+hv-sJnO8Jcg@mail.gmail.com","subject":"Re: en/merge-tree","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-06-22T23:13:41Z","receivedAt":"2022-06-22T23:13:47Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Elijah Newren <newren@gmail.com> writes:\n\n> On Wed, Jun 22, 2022 at 12:41 PM Junio C Hamano <gitster@pobox.com> wrote:\n>> [Stalled]\n>>\n>> * en/merge-tree (2022-02-23) 13 commits\n>> ...\n> Can you update from \"On hold\" to \"new patchset exists\" (new source:\n> <pull.1122.v7.git.1655511660.gitgitgadget@gmail.com>) and move it out\n> from the stalled section?\n\nAs I diverted my attention to the topic for that anyway, it will not\nstop at \"new patchset exists\" but actually would have to be replaced\nbefore getting described in a new issue of the \"What's cooking\"\nreport.  \"Will merge to 'next'?\" would be the least the topic would\nreceive even during the pre-release freeze.\n\nThanks.\n\n\n"},{"id":"457766","messageId":"nycvar.QRO.7.76.6.2206231201470.349@tvgsbejvaqbjf.bet","threadId":"58053","inReplyTo":"CABPp-BGGDvZ40TY939fFM0xPZuaogPS+ymfEpc+hv-sJnO8Jcg@mail.gmail.com","subject":"Re: en/merge-tree (Was: Re: What's cooking in git.git (Jun 2022, #07; Wed, 22))","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2022-06-23T10:02:39Z","receivedAt":"2022-06-23T10:03:01Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio & Elijah,\n\nOn Wed, 22 Jun 2022, Elijah Newren wrote:\n\n> On Wed, Jun 22, 2022 at 12:41 PM Junio C Hamano <gitster@pobox.com> wrote:\n> > [Stalled]\n> >\n> > * en/merge-tree (2022-02-23) 13 commits\n> >  - git-merge-tree.txt: add a section on potentional usage mistakes\n> >  - merge-tree: add a --allow-unrelated-histories flag\n> >  - merge-tree: allow `ls-files -u` style info to be NUL terminated\n> >  - merge-tree: provide easy access to `ls-files -u` style info\n> >  - merge-tree: provide a list of which files have conflicts\n> >  - merge-ort: provide a merge_get_conflicted_files() helper function\n> >  - merge-tree: support including merge messages in output\n> >  - merge-ort: split out a separate display_update_messages() function\n> >  - merge-tree: implement real merges\n> >  - merge-tree: add option parsing and initial shell for real merge function\n> >  - merge-tree: move logic for existing merge into new function\n> >  - merge-tree: rename merge_trees() to trivial_merge_trees()\n> >  - Merge branch 'en/remerge-diff' into en/merge-trees\n> >\n> >  A new command is introduced that takes two commits and computes a\n> >  tree that would be contained in the resulting merge commit, if the\n> >  histories leading to these two commits were to be merged, and is\n> >  added as a new mode of \"git merge-tree\" subcommand.\n> >\n> >  On hold.\n> >  cf. <CABPp-BGZ7OAYRR5YKRsxJSo-C=ho+qcNAkqwkim8CkhCfCeHsA@mail.gmail.com>\n> >  source: <pull.1122.v6.git.1645602413.gitgitgadget@gmail.com>\n>\n> Can you update from \"On hold\" to \"new patchset exists\" (new source:\n> <pull.1122.v7.git.1655511660.gitgitgadget@gmail.com>) and move it out\n> from the stalled section?\n>\n> (Also, FWIW, v7 was collaborative effort between Dscho and I, and\n> we're now finally both pretty happy with the state of the patches, as\n> noted over at https://lore.kernel.org/git/CABPp-BFfRGQybYManC6LfFTaAd3mweBxL=APCGP_vRF-WQxGSw@mail.gmail.com/).\n\nI would like to enthusiastically confirm from my side that what Elijah\nsaid is exactly how I see it, too.\n\nThanks,\nDscho\n"},{"id":"457772","messageId":"220623.86sfnvk5rw.gmgdl@evledraar.gmail.com","threadId":"58053","inReplyTo":"xmqq7d584hqb.fsf@gitster.g","subject":"ab/test-without-templates (was: What's cooking in git.git (Jun 2022, #07; Wed, 22))","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2022-06-23T10:55:07Z","receivedAt":"2022-06-23T10:56:08Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Wed, Jun 22 2022, Junio C Hamano wrote:\n\n> * ab/test-without-templates (2022-06-06) 7 commits\n>  - tests: don't assume a .git/info for .git/info/sparse-checkout\n>  - tests: don't assume a .git/info for .git/info/exclude\n>  - tests: don't assume a .git/info for .git/info/refs\n>  - tests: don't assume a .git/info for .git/info/attributes\n>  - tests: don't assume a .git/info for .git/info/grafts\n>  - tests: don't depend on template-created .git/branches\n>  - t0008: don't rely on default \".git/info/exclude\"\n>\n>  Tweak tests so that they still work when the \"git init\" template\n>  did not create .git/info directory.\n>\n>  Will merge to 'next'?\n>  source: <cover-v2-0.7-00000000000-20220603T110506Z-avarab@gmail.com>\n\nPresumably the submitters vote doesn't count for much, but FWIW I think\nit's ready & that there's nothing outstanding left to address.\n"},{"id":"457773","messageId":"220623.86o7yjk5l2.gmgdl@evledraar.gmail.com","threadId":"58053","inReplyTo":"xmqq7d584hqb.fsf@gitster.g","subject":"hx/unpack-streaming (was: What's cooking in git.git (Jun 2022, #07; Wed, 22))","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2022-06-23T10:59:11Z","receivedAt":"2022-06-23T11:00:15Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Wed, Jun 22 2022, Junio C Hamano wrote:\n\n> * hx/unpack-streaming (2022-06-13) 6 commits\n>  - unpack-objects: use stream_loose_object() to unpack large objects\n>  - core doc: modernize core.bigFileThreshold documentation\n>  - object-file.c: add \"stream_loose_object()\" to handle large object\n>  - object-file.c: factor out deflate part of write_loose_object()\n>  - object-file.c: refactor write_loose_object() to several steps\n>  - unpack-objects: low memory footprint for get_data() in dry_run mode\n>\n>  Allow large objects read from a packstream to be streamed into a\n>  loose object file straight, without having to keep it in-core as a\n>  whole.\n>\n>  Will merge to 'next'?\n>  source: <cover.1654914555.git.chiyutianyi@gmail.com>\n\nI've thoroughly reviewed this topic both now & in the past, and I think\nit's ready to be merged down.\n"},{"id":"457815","messageId":"xmqqwnd7xcbg.fsf@gitster.g","threadId":"58053","inReplyTo":"220623.86o7yjk5l2.gmgdl@evledraar.gmail.com","subject":"Re: hx/unpack-streaming","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-06-23T22:08:35Z","receivedAt":"2022-06-23T22:08:43Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:\n\n> On Wed, Jun 22 2022, Junio C Hamano wrote:\n>\n>> * hx/unpack-streaming (2022-06-13) 6 commits\n>>  - unpack-objects: use stream_loose_object() to unpack large objects\n>>  - core doc: modernize core.bigFileThreshold documentation\n>>  - object-file.c: add \"stream_loose_object()\" to handle large object\n>>  - object-file.c: factor out deflate part of write_loose_object()\n>>  - object-file.c: refactor write_loose_object() to several steps\n>>  - unpack-objects: low memory footprint for get_data() in dry_run mode\n>>\n>>  Allow large objects read from a packstream to be streamed into a\n>>  loose object file straight, without having to keep it in-core as a\n>>  whole.\n>>\n>>  Will merge to 'next'?\n>>  source: <cover.1654914555.git.chiyutianyi@gmail.com>\n>\n> I've thoroughly reviewed this topic both now & in the past, and I think\n> it's ready to be merged down.\n\nI was involved in reviewing its earlier rounds but didn't read the\nlast round too carefully.  I'll give it another read-over before\nmerging it down.\n\nThanks, all.\n"},{"id":"457816","messageId":"xmqqr13fxc5l.fsf@gitster.g","threadId":"58053","inReplyTo":"220623.86sfnvk5rw.gmgdl@evledraar.gmail.com","subject":"Re: ab/test-without-templates","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-06-23T22:12:06Z","receivedAt":"2022-06-23T22:12:13Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:\n\n> On Wed, Jun 22 2022, Junio C Hamano wrote:\n>\n>> * ab/test-without-templates (2022-06-06) 7 commits\n>>  - tests: don't assume a .git/info for .git/info/sparse-checkout\n>>  - tests: don't assume a .git/info for .git/info/exclude\n>>  - tests: don't assume a .git/info for .git/info/refs\n>>  - tests: don't assume a .git/info for .git/info/attributes\n>>  - tests: don't assume a .git/info for .git/info/grafts\n>>  - tests: don't depend on template-created .git/branches\n>>  - t0008: don't rely on default \".git/info/exclude\"\n>>\n>>  Tweak tests so that they still work when the \"git init\" template\n>>  did not create .git/info directory.\n>>\n>>  Will merge to 'next'?\n>>  source: <cover-v2-0.7-00000000000-20220603T110506Z-avarab@gmail.com>\n>\n> Presumably the submitters vote doesn't count for much, but FWIW I think\n> it's ready & that there's nothing outstanding left to address.\n\nI do not think they make any particular test to break, but I do not\nthink it is a good idea overall to give a false impression to the\nusers that it is OK to use incomplete templates that lack things\nexpected by Git in properly initialized repositories.  And these\npatches definitely take things in that wrong direction.\n\n\n"},{"id":"457824","messageId":"kl6lk096iwk3.fsf@chooglen-macbookpro.roam.corp.google.com","threadId":"58053","inReplyTo":"xmqq7d584hqb.fsf@gitster.g","subject":"gc/submodule-update (was Re: What's cooking in git.git (Jun 2022, #07; Wed, 22))","fromName":"Glen Choo","fromEmail":"chooglen@google.com","sentAt":"2022-06-24T03:12:44Z","receivedAt":"2022-06-24T03:14:21Z","isPatch":false,"sender":{"key":"glencbz@gmail.com","avatar":"https://avatars.githubusercontent.com/u/58092771?v=4"},"body":"Junio C Hamano <gitster@pobox.com> writes:\n\n> * gc/submodule-update (2022-06-15) 12 commits\n>  - git-sh-setup.sh: remove \"say\" function, change last users\n>  - git-submodule.sh: use \"$quiet\", not \"$GIT_QUIET\"\n>  - submodule--helper: eliminate internal \"--update\" option\n>  - submodule--helper: understand --checkout, --merge and --rebase synonyms\n>  - submodule--helper: report \"submodule\" as our name in \"-h\" output\n>  - submodule--helper: rename \"absorb-git-dirs\" to \"absorbgitdirs\"\n>  - submodule update: remove \"-v\" option\n>  - submodule--helper: have --require-init imply --init\n>  - git-submodule.sh: remove unused top-level \"--branch\" argument\n>  - git-submodule.sh: make \"$cached\" variable a boolean\n>  - git-submodule.sh: remove unused $prefix var and --super-prefix\n>  - git-submodule.sh: remove unused sanitize_submodule_env()\n>\n>  More work on \"git submodule update\".\n>\n>  Needs review.\n>  source: <cover-v2-00.12-00000000000-20220613T220150Z-avarab@gmail.com>\n\nI think this is worth renaming since 1. Ævar has taken over this and 2.\nit is no longer primarily about \"git submodule update\".\n\nMaybe \"ab/submodule-cleanup\" and \"Preparation to turn git-submodule.sh\ninto a builtin\"?\n"},{"id":"457851","messageId":"xmqqo7yivzu4.fsf@gitster.g","threadId":"58053","inReplyTo":"kl6lk096iwk3.fsf@chooglen-macbookpro.roam.corp.google.com","subject":"Re: gc/submodule-update (was Re: What's cooking in git.git (Jun 2022, #07; Wed, 22))","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-06-24T15:35:47Z","receivedAt":"2022-06-24T15:35:55Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Glen Choo <chooglen@google.com> writes:\n\n> I think this is worth renaming since 1. Ævar has taken over this and 2.\n> it is no longer primarily about \"git submodule update\".\n>\n> Maybe \"ab/submodule-cleanup\" and \"Preparation to turn git-submodule.sh\n> into a builtin\"?\n\nThanks.  Greatly appreciated.\n"},{"id":"457902","messageId":"220627.864k06i8im.gmgdl@evledraar.gmail.com","threadId":"58053","inReplyTo":"xmqqr13fxc5l.fsf@gitster.g","subject":"Re: ab/test-without-templates","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2022-06-27T12:29:50Z","receivedAt":"2022-06-27T12:41:13Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Thu, Jun 23 2022, Junio C Hamano wrote:\n\n> Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:\n>\n>> On Wed, Jun 22 2022, Junio C Hamano wrote:\n>>\n>>> * ab/test-without-templates (2022-06-06) 7 commits\n>>>  - tests: don't assume a .git/info for .git/info/sparse-checkout\n>>>  - tests: don't assume a .git/info for .git/info/exclude\n>>>  - tests: don't assume a .git/info for .git/info/refs\n>>>  - tests: don't assume a .git/info for .git/info/attributes\n>>>  - tests: don't assume a .git/info for .git/info/grafts\n>>>  - tests: don't depend on template-created .git/branches\n>>>  - t0008: don't rely on default \".git/info/exclude\"\n>>>\n>>>  Tweak tests so that they still work when the \"git init\" template\n>>>  did not create .git/info directory.\n>>>\n>>>  Will merge to 'next'?\n>>>  source: <cover-v2-0.7-00000000000-20220603T110506Z-avarab@gmail.com>\n>>\n>> Presumably the submitters vote doesn't count for much, but FWIW I think\n>> it's ready & that there's nothing outstanding left to address.\n>\n> I do not think they make any particular test to break, but I do not\n> think it is a good idea overall to give a false impression to the\n> users that it is OK to use incomplete templates that lack things\n> expected by Git in properly initialized repositories.  And these\n> patches definitely take things in that wrong direction.\n\nIn the CL I mentioned some \"future goals\" goals that you may or may not\nagree with, to elaborate on [1]:\n\n - Eventually running the whole test suite without \"git init\" creating\n   repositories with templates.\n\n - Running without the bin-wrappers, which as mentions allows us to run\n   faster, and improves our test coverage (it's hard to test some\n   aspects of invoking \"git\", when really we're invoking a shellscript\n   that invokes git).\n\n - Having some config option or other handy way to \"git init\" without\n   templates (just formalizing the existing \"--template=\" invocation).\n\nYou may disagree with some or all of those, but this series doesn't try\nto get you to agree with any of them. It's just making our tests more\nsturdy and explicit in their intent by clearly declaring which parts of\nthem are relying on our default templates.\n\nSo it's helping us spot issues like the one fixed in 7f44842ac19\n(sparse-checkout: create leading directory, 2022-01-21) earlier.\n\nI really don't disagree with you per-se about us defining some minimum\nviable template, and declaring that pointing --template=* to an empty\ndirectory is unsupported.\n\nBut I think it's unarguable that the status quo is leaving our users in\nlimbo on that question. Neither git-init(1) nor gitrepository-layout(5)\netc. cover that question.\n\nNow, I think based on unsubmitted patches I've wrote that just handling\nthose cases in code is easier. I.e. it's a small matter of adding a\n\"mkdir x/y\" before we create \"x/y\", and almost all of that code is code\nwe have already, so we're mostly supporting the \"empty dir\" template\nmodel.\n\nBut I'm not trying to argue for that here, nor is this series. What this\nseries does is make it easier to avoid bugs and unexpected behavior in\nthat are, whatever your position on the \"minmum viable template\"\nquestion is.\n\n1. https://lore.kernel.org/git/cover-v2-0.7-00000000000-20220603T110506Z-avarab@gmail.com/\n"},{"id":"457914","messageId":"xmqqbkueqe5z.fsf@gitster.g","threadId":"58053","inReplyTo":"220627.864k06i8im.gmgdl@evledraar.gmail.com","subject":"Re: ab/test-without-templates","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-06-27T16:11:52Z","receivedAt":"2022-06-27T16:12:15Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:\n\n> You may disagree with some or all of those, but this series doesn't try\n> to get you to agree with any of them. It's just making our tests more\n> sturdy and explicit in their intent by clearly declaring which parts of\n> them are relying on our default templates.\n>\n> So it's helping us spot issues like the one fixed in 7f44842ac19\n> (sparse-checkout: create leading directory, 2022-01-21) earlier.\n\nIt's like arguing \"this series is a bugfix, so what it fixes are by\ndefinition bugs\", isn't it?\n\n> I really don't disagree with you per-se about us defining some minimum\n> viable template,...\n\nWell then it becomes debatable if it is a \"bug\" not to handle\nmissing .git/info that needs \"fixing\" by this series, and it also\nmakes it debatable if 7f44842a (sparse-checkout: create leading\ndirectory, 2022-01-21) was also a \"bugfix\", or just tightening\nagainst environment the end-user broke, no?\n"},{"id":"457928","messageId":"220627.86zghygdtd.gmgdl@evledraar.gmail.com","threadId":"58053","inReplyTo":"xmqqbkueqe5z.fsf@gitster.g","subject":"Re: ab/test-without-templates","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2022-06-27T18:23:06Z","receivedAt":"2022-06-27T18:34:36Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Mon, Jun 27 2022, Junio C Hamano wrote:\n\n> Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:\n>\n>> You may disagree with some or all of those, but this series doesn't try\n>> to get you to agree with any of them. It's just making our tests more\n>> sturdy and explicit in their intent by clearly declaring which parts of\n>> them are relying on our default templates.\n>>\n>> So it's helping us spot issues like the one fixed in 7f44842ac19\n>> (sparse-checkout: create leading directory, 2022-01-21) earlier.\n>\n> It's like arguing \"this series is a bugfix, so what it fixes are by\n> definition bugs\", isn't it?\n\nNo, I don't think the test code is buggy as it stands now, but relying\non our default templates is making it easy to introduce new bugs in code\nthat doesn't handle other templates than the default.\n\nThis series doesn't get us all the way to running without that template\nfor all tests, but I have follow-up patches that do that, after these\nchanges that's a mostly a small matter of flipping the default, these\nwere most of the changes required in the test logic.\n\n>> I really don't disagree with you per-se about us defining some minimum\n>> viable template,...\n>\n> Well then it becomes debatable if it is a \"bug\" not to handle\n> missing .git/info that needs \"fixing\" by this series, and it also\n> makes it debatable if 7f44842a (sparse-checkout: create leading\n> directory, 2022-01-21) was also a \"bugfix\", or just tightening\n> against environment the end-user broke, no?\n\nI don't think it's a broken environment. If you e.g. move .git/objects\nto .git/objects.new you can't expect your repository to work, but we've\nnever implied or documented that about e.g. .git/hooks, .git/info etc.\n\nAnd indeed almost all parts of git create the required paths on demand\nand/or handle missing paths gracefully.\n\nI don't see why we should take some stance that we're going to be\nunhelpfully pedantic about repositories we find on-disk, even if we had\nnever had a \"--template\" option for \"git init\" to create such\nrepositories. I think 7f44842a was the right thing to do.\n"}]}