{"thread":{"id":"57367","subject":"What's cooking in git.git (Feb 2022, #01; Thu, 3)","startedAt":"2022-02-04T05:22:57Z","lastAt":"2022-02-09T14:57:34Z","messageCount":22,"participants":["Junio C Hamano","Eric Sunshine","Elijah Newren","Ævar Arnfjörð Bjarmason","Jean-Noël AVILA","Bagas Sanjaya","Phillip Wood","Derrick Stolee"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"447706","messageId":"xmqqr18jnr2t.fsf@gitster.g","threadId":"57367","inReplyTo":null,"subject":"What's cooking in git.git (Feb 2022, #01; Thu, 3)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-02-04T05:22:50Z","receivedAt":"2022-02-04T05:22:57Z","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',\nwhich means nothing more than that I have found them of interest for\nsome reason (like \"it may have hard-to-resolve conflicts with\nanother topic already in flight\" or \"this may turn out to be\nuseful\"). Do not read too much into a topic being in (or not in)\n'seen'. The ones marked with '.' do not appear in any of the\nintegration branches, but I am still holding onto them.\n\nWill merge a bunch of topics as the first batch in this cycle down\nto 'master' (aka 'main'), hopefully tomorrow.\n\nMany topics have sketchy or even empty topic description in the list\nbelow; help to fill them in is very much appreciated ;-)\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* en/keep-cwd (2022-01-26) 1 commit\n (merged to 'next' on 2022-01-26 at b2518a683c)\n + sequencer, stash: fix running from worktree subdir\n\n Fix a regression in 2.35 that roke the use of \"rebase\" and \"stash\"\n in a secondary worktree.\n source: \n\n--------------------------------------------------\n[New Topics]\n\n* jt/clone-not-quite-empty (2022-01-26) 1 commit\n (merged to 'next' on 2022-01-26 at c3bb39676e)\n + clone: support unusual remote ref configurations\n\n Cloning from a repository that does not yet have any branches or\n tags but has other refs resulted in a \"remote transport reported\n error\", which has been corrected.\n\n Will merge to 'master'.\n source: <20220124180909.2437002-1-jonathantanmy@google.com>\n\n\n* ab/no-errno-from-resolve-ref-unsafe (2022-01-26) 2 commits\n - refs API: remove \"failure_errno\" from refs_resolve_ref_unsafe()\n - sequencer: don't use die_errno() on refs_resolve_ref_unsafe() failure\n\n Remaining code-clean-up.\n\n Will merge to 'next'. \n source: \n\n\n* gh/doc-typos (2022-01-26) 2 commits\n - Documentation/config/pgp.txt: add missing apostrophe\n - Documentation/config/pgp.txt: replace stray character with \n\n Typofix.\n\n Will merge to 'next'.\n source: <20220126121426.53799-1-greg@hurrell.net>\n\n\n* jc/doc-log-messages (2022-01-27) 3 commits\n - SubmittingPatches: explain why we care about log messages\n - CodingGuidelines: hint why we value clearly written log messages\n - SubmittingPatches: write problem statement in the log in the present tense\n\n Update the contributor-facing documents on proposed log messages.\n\n Will merge to 'next'?\n source: <20220126234205.2923388-1-gitster@pobox.com>\n\n\n* en/fetch-negotiation-default-fix (2022-02-02) 3 commits\n - repo-settings: rename the traditional default fetch.negotiationAlgorithm\n - repo-settings: fix error handling for unknown values\n - repo-settings: fix checking for fetch.negotiationAlgorithm=default\n\n Fix interaction between fetch.negotiationAlgorithm and\n feature.experimental configuration variables.\n\n Will merge to 'next'.\n source: \n\n\n* en/sparse-checkout-leakfix (2022-01-28) 1 commit\n - sparse-checkout: fix a couple minor memory leaks\n\n Leakfix.\n\n Will merge to 'next'.\n source: \n\n\n* js/diff-filter-negation-fix (2022-01-28) 3 commits\n - diff-filter: be more careful when looking for negative bits\n - diff.c: move the diff filter bits definitions up a bit\n - docs(diff): lose incorrect claim about `diff-files --diff-filter=A`\n\n \"git diff --diff-filter=aR\" is now parsed correctly.\n\n Will merge to 'next'.\n source: \n\n\n* js/no-more-legacy-stash (2022-01-27) 4 commits\n - stash: stop warning about the obsolete `stash.useBuiltin` config setting\n - stash: remove documentation for `stash.useBuiltin`\n - add: remove support for `git-legacy-stash`\n - git-sh-setup: remove remnant bits referring to `git-legacy-stash`\n\n Removal of unused code and doc.\n\n Will merge to 'next'.\n source: \n\n\n* js/scalar-global-options (2022-01-28) 1 commit\n - scalar: accept -C and -c options before the subcommand\n\n Scalar update.\n\n Will merge to 'next'.\n source: \n\n\n* rc/negotiate-only-typofix (2022-01-28) 1 commit\n - fetch: fix negotiate-only error message\n\n Typofix.\n\n Will merge to 'next'.\n source: <20220128143602.31842-1-robert@coup.net.nz>\n\n\n* rj/receive-pack-abort-upon-disconnect (2022-01-28) 1 commit\n - receive-pack: check if client is alive before completing the push\n\n \"git push\" may be killed by the user when the server side has\n finished receiving all data and is about to commit the result.\n Give the latter a better chance to notice such situation and abort\n processing the ref updates.\n\n Will merge to 'next'?\n source: <20220128194811.3396281-1-robin.jarry@6wind.com>\n\n\n* jz/patch-id-hunk-header-parsing-fix (2022-02-02) 2 commits\n - patch-id: fix scan_hunk_header on diffs with 1 line of before/after\n - patch-id: fix antipatterns in tests\n\n Unlike \"git apply\", \"git patch-id\" did not handle patches with\n hunks that has only 1 line in either preimage or postimage, which\n has been corrected.\n\n Will merge to 'next'.\n source: <20220202041945.10077-1-jerry@skydio.com>\n source: <20220202042015.10115-1-jerry@skydio.com>\n\n\n* tg/fetch-prune-exit-code-fix (2022-01-31) 1 commit\n - fetch --prune: exit with error if pruning fails\n\n When \"git fetch --prune\" failed to prune the refs it wanted to\n prune, the command issued error messages but exited with exit\n status 0, which has been corrected.\n\n Will merge to 'next'.\n source: <20220131133047.1885074-1-t.gummerer@gmail.com>\n\n\n* ab/do-not-hide-failures-in-git-dot-pm (2022-02-01) 1 commit\n - perl Git.pm: don't ignore signalled failure in _cmd_close()\n\n Git.pm update.\n\n Will merge to 'next'.\n source: \n\n\n* ab/object-file-api-updates (2022-02-01) 10 commits\n - object-file API: pass an enum to read_object_with_reference()\n - object-file.c: add a literal version of write_object_file_prepare()\n - object-file API: replace check_object_signature() with stream_*\n - object-file API: have hash_object_file() take \"enum object_type\"\n - object-file API: replace some use of check_object_signature()\n - object-file API: provide a hash_object_file_oideq()\n - object-file API: have write_object_file() take \"enum object_type\"\n - object-file API: add a format_object_header() function\n - object-file API: return \"void\", not \"int\" from hash_object_file()\n - object-file.c: split up declaration of unrelated variables\n\n source: \n\n\n* cb/clear-quarantine-early-on-all-ref-update-errors (2022-02-01) 1 commit\n - receive-pack: purge temporary data if no command is ready to run\n\n Check if \"receive-pack\" will do any ref updates (various conditions\n could reject a push) before received objects are taken out of the\n temporary directory used for quarantine purposes, so that a push\n that is known-to-fail will not leave crufts that a future \"gc\"\n needs to clean up.\n\n Will merge to 'next'?\n source: <20220129063538.24038-1-bojun.cbj@gmail.com>\n\n\n* hn/reftable-tests (2022-01-31) 3 commits\n - t5312: prepare for reftable\n - t1405: mark test that checks existence as REFFILES\n - t1405: explictly delete reflogs for reftable\n\n Prepare more test scripts for the introduction of reftable.\n\n Will merge to 'next'.\n source: \n\n\n* ja/i18n-common-messages (2022-01-31) 5 commits\n - i18n: fix some misformated placeholders in command synopsis\n - i18n: remove from i18n strings that do not hold translatable parts\n - i18n: factorize \"invalid value\" messages\n - SQUASH???\n - i18n: factorize more 'incompatible options' messages\n\n Unify more messages to help l10n.\n\n Will merge to 'next' after squashing the fix-up in.\n source: \n\n\n* tk/subtree-merge-not-ff-only (2022-02-01) 1 commit\n - subtree: force merge commit\n\n When \"git subtree\" wants to create a merge, it used \"git merge\" and\n let it be affected by end-user's \"merge.ff\" configuration, which\n has been corrected.\n\n Will merge to 'next'.\n source: <20220201172601.262718-1-aclopte@gmail.com>\n\n\n* ab/complete-show-all-commands (2022-02-02) 2 commits\n - completion: add a GIT_COMPLETION_SHOW_ALL_COMMANDS\n - completion tests: re-source git-completion.bash in a subshell\n\n The command line completion script (in contrib/) learns an option\n to complete all Git subcommands, including the ones that are\n normally hidden.\n\n Will merge to 'next'.\n source: \n\n\n* en/merge-tree (2022-02-02) 16 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: allow update messages to be written to different file stream\n - merge-ort: split out a separate display_update_messages() function\n - diff: allow diff_warn_rename_limit to write somewhere besides stderr\n - Introduce a variant of the `warning()` function that takes a `FILE *`\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 (this branch uses en/remerge-diff.)\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 source: \n\n\n* ll/doc-mktree-typofix (2022-02-02) 1 commit\n - fix typo in git-mktree.txt\n\n Typofix.\n\n Will merge to 'next'.\n source: \n\n* po/doc-check-ignore-markup-fix (2022-02-03) 1 commit\n - doc: check-ignore: code-quote an exclamation mark\n\n Typofix.\n\n Will merge to 'next'.\n source: <20220203101643.1987-1-philipoakley@iee.email>\n\n\n* sy/diff-usage-typofix (2022-02-02) 1 commit\n - builtin/diff.c: fix \"git-diff\" usage string typo\n\n Typofix.\n\n Will merge to 'next'.\n source: <20220202072844.35545-1-shaoxuan.yuan02@gmail.com>\n\n\n* sy/modernize-t-lib-read-tree-m-3way (2022-02-02) 2 commits\n - t/lib-read-tree-m-3way: indent with tabs\n - t/lib-read-tree-m-3way: modernize style\n\n Style updates on a test script helper.\n\n Will merge to 'next'.\n source: <20220123060318.471414-1-shaoxuan.yuan02@gmail.com>\n\n--------------------------------------------------\n[Stalled]\n\n* je/http-better-error-output (2021-12-03) 1 commit\n . http-backend: give a hint that web browser access is not supported\n\n When the http-backend program, which is the server-side component\n for the smart HTTP transport, sends a \"404 Not found\" error, we\n deliberately did not say anything to the requesting client. We now\n send a message back to the browser to tell the user that they do\n not want to visit the URL via their browser, instead of a totally\n blank page.\n\n Expecting a reroll.\n Breaks its self tests.\n cf. <7r23s082-o3q0-479o-srqn-r45q778s5nq7@vanv.qr>\n source: <20211202102855.23907-1-jengelh@inai.de>\n\n\n* cb/save-term-across-editor-invocation (2021-12-01) 3 commits\n - fixup! editor: allow for saving/restoring terminal state\n - editor: allow for saving/restoring terminal state\n - terminal: teach save_term to fail when not foreground\n\n Some editors are reported to leave the terminal in funny state\n after they exit on Windows. Work it around by saving and restoring\n the terminal state when needed.\n\n Expecting a reroll.\n cf. \n source: <20211202035446.1154-1-carenas@gmail.com>\n\n\n* ar/submodule-update (2022-01-28) 9 commits\n . submodule: move core cmd_update() logic to C\n . submodule tests: test for init and update failure output\n . submodule--helper: don't use bitfield indirection for parse_options()\n . builtin/submodule--helper.c: rename option variables to \"opt\"\n . builtin/submodule--helper.c: reformat designated initializers\n . submodule--helper: run update using child process struct\n . submodule--helper: allow setting superprefix for init_submodule()\n . submodule--helper: refactor get_submodule_displaypath()\n . submodule--helper: get remote names from any repository\n\n Rewrite of \"git submodule update\" in C.\n source: \n\n--------------------------------------------------\n[Cooking]\n\n* jc/mem-pool-alignment (2022-01-24) 1 commit\n (merged to 'next' on 2022-01-26 at 057b6a78f5)\n + mem-pool: don't assume uintmax_t is aligned enough for all types\n\n Update the logic to compute alignment requirement for our mem-pool.\n\n Will merge to 'master'.\n source: <20220123203347.74869-1-jrtc27@jrtc27.com>\n\n\n* ab/auto-detect-zlib-compress2 (2022-01-26) 1 commit\n - compat: auto-detect if zlib has uncompress2()\n\n Notice older zlib to enable our replacement uncompress2()\n automatically.\n\n Will merge to 'next'.\n source: \n\n\n* en/plug-leaks-in-merge (2022-01-21) 2 commits\n (merged to 'next' on 2022-01-26 at 0cf6aa0a2b)\n + merge: fix memory leaks in cmd_merge()\n + merge-ort: fix memory leak in merge_ort_internal()\n\n Leakfix.\n\n Will merge to 'master'.\n source: \n\n\n* js/apply-partial-clone-filters-recursively (2022-01-21) 1 commit\n - clone, submodule: pass partial clone filters to submodules\n\n \"git clone --filter=... --recurse-submodules\" only makes the\n top-level a partial clone, while submodules are fully cloned. This\n behaviour is changed to pass the same filter down to the submodules.\n\n It is unclear passing all filters down is a good idea. It\n definitely is contrary to the project norm to flip the default\n instead of starting the new behaviour as an optional behaviour.\n cf. \n source: <50ebf7bd39adf34fa4ada27cd433d81b5381abe5.1642735881.git.steadmon@google.com>\n\n\n* js/sparse-vs-split-index (2022-01-23) 3 commits\n (merged to 'next' on 2022-01-26 at 7443487955)\n + split-index: it really is incompatible with the sparse index\n + t1091: disable split index\n + sparse-index: sparse index is disallowed when split index is active\n\n Mark in various places in the code that the sparse index and the\n split index features are mutually incompatible.\n\n Will merge to 'master'.\n source: \n\n\n* js/test-unset-trace2-parents (2022-01-20) 1 commit\n (merged to 'next' on 2022-01-20 at ebb085e3e4)\n + test-lib: unset trace2 parent envvars\n\n Avoid tests that are run under GIT_TRACE2 set from failing\n unnecessarily.\n\n Will merge to 'master'.\n source: <82e51a52e20fbe13a5a898a0a2f6dbe1188e3fa3.1642116539.git.steadmon@google.com>\n\n\n* jt/sparse-checkout-leading-dir-fix (2022-01-21) 1 commit\n (merged to 'next' on 2022-01-26 at 5611ce9047)\n + sparse-checkout: create leading directory\n\n \"git sparse-checkout init\" failed to write into $GIT_DIR/info\n directory when the repository was created without one, which has\n been corrected to auto-create it.\n\n Will merge to 'master'.\n source: <20220121174441.3991963-1-jonathantanmy@google.com>\n\n\n* rs/parse-options-lithelp-help (2022-01-20) 1 commit\n - parse-options: document bracketing of argh\n\n Comment update.\n\n Will merge to 'next'.\n source: \n\n\n* en/merge-ort-restart-optim-fix (2022-01-17) 1 commit\n (merged to 'next' on 2022-01-19 at 84da10b057)\n + merge-ort: avoid assuming all renames detected\n\n The merge-ort misbehaved when merge.renameLimit configuration is\n set too low and failed to find all renames.\n\n Will merge to 'master'.\n source: \n\n\n* jh/p4-various-fixups (2022-01-16) 23 commits\n . git-p4: seperate multiple statements onto seperate lines\n . git-p4: move inline comments to line above\n . git-p4: only seperate code blocks by a single empty line\n . git-p4: compare to singletons with \"is\" and \"is not\"\n . git-p4: normalize indentation of lines in conditionals\n . git-p4: ensure there is a single space around all operators\n . git-p4: ensure every comment has a single #\n . git-p4: remove spaces between dictionary keys and colons\n . git-p4: remove redundant backslash-continuations inside brackets\n . git-p4: remove extraneous spaces before function arguments\n . git-p4: place a single space after every comma\n . git-p4: removed brackets when assigning multiple return values\n . git-p4: remove spaces around default arguments\n . git-p4: remove padding from lists, tuples and function arguments\n . git-p4: sort and de-duplcate pylint disable list\n . git-p4: remove commented code\n . git-p4: convert descriptive class and function comments into docstrings\n . git-p4: improve consistency of docstring formatting\n . git-p4: indent with 4-spaces\n . git-p4: remove unneeded semicolons from statements\n . git-p4: add blank lines between functions and class definitions\n . Merge branch 'jh/p4-spawning-external-commands-cleanup' into jh/p4-various-fixups\n . Merge branch 'jh/p4-fix-use-of-process-error-exception' into jh/p4-various-fixups\n (this branch uses jh/p4-fix-use-of-process-error-exception and jh/p4-spawning-external-commands-cleanup.)\n\n Various cleanups to \"git p4\".\n\n Breaks its own test suite.\n source: <20220116160550.514637-1-jholdsworth@nvidia.com>\n\n\n* po/readme-mention-contributor-hints (2022-01-17) 1 commit\n (merged to 'next' on 2022-01-19 at 7e14690eb9)\n + README.md: add CodingGuidelines and a link for Translators\n\n Doc update.\n\n Will merge to 'master'.\n source: \n\n\n* tl/doc-cli-options-first (2022-01-17) 1 commit\n (merged to 'next' on 2022-01-19 at 9ec14cfe73)\n + git-cli.txt: clarify \"options first and then args\"\n\n We explain that revs come first before the pathspec among command\n line arguments, but did not spell out that dashed options come\n before other args, which has been corrected.\n\n Will merge to 'master'.\n source: \n\n\n* rs/bisect-executable-not-found (2022-01-19) 4 commits\n - bisect--helper: double-check run command on exit code 126 and 127\n - bisect: document run behavior with exit codes 126 and 127\n - bisect--helper: release strbuf and strvec on run error\n - bisect--helper: report actual bisect_state() argument on error\n\n A not-so-common mistake is to write a script to feed \"git bisect\n run\" without making it executable, in which case all tests will\n exit with 126 or 127 error codes, even on revisions that are marked\n as good. Try to recoginse this situation and stop iteration early.\n\n Will merge to 'next'?\n source: \n\n\n* ds/sparse-checkout-requires-per-worktree-config (2022-01-31) 5 commits\n - worktree: copy sparse-checkout patterns and config on add\n - sparse-checkout: set worktree-config correctly\n - config: add repo_config_set_worktree_gently()\n - worktree: create init_worktree_config()\n - Documentation: add extensions.worktreeConfig details\n\n \"git sparse-checkout\" wants to work with per-worktree configration,\n but did not work well in a worktree attached to a bare repository.\n\n What's the doneness of this one?\n source: \n\n\n* pw/add-p-hunk-split-fix (2022-01-12) 2 commits\n (merged to 'next' on 2022-01-19 at ea57b2c9a6)\n + builtin add -p: fix hunk splitting\n + t3701: clean up hunk splitting tests\n\n \"git add -p\" rewritten in C regressed hunk splitting in some cases,\n which has been corrected.\n\n Will merge to 'master'.\n source: \n\n\n* gc/fetch-negotiate-only-early-return (2022-01-20) 4 commits\n (merged to 'next' on 2022-01-20 at e7616428eb)\n + fetch: help translators by reusing the same message template\n (merged to 'next' on 2022-01-19 at 0f15147cfa)\n + fetch --negotiate-only: do not update submodules\n + fetch: skip tasks related to fetching objects\n + fetch: use goto cleanup in cmd_fetch()\n\n \"git fetch --negotiate-only\" is an internal command used by \"git\n push\" to figure out which part of our history is missing from the\n other side. It should never recurse into submodules even when\n fetch.recursesubmodules configuration variable is set, nor it\n should trigger \"gc\". The code has been tightened up to ensure it\n only does common ancestry discovery and nothing else.\n\n Will merge to 'master'.\n source: <20220119000056.58503-1-chooglen@google.com>\n\n\n* jh/p4-fix-use-of-process-error-exception (2022-01-06) 1 commit\n (merged to 'next' on 2022-01-10 at 49d529bfd7)\n + git-p4: fix instantiation of CalledProcessError\n (this branch is used by jh/p4-various-fixups.)\n\n Will merge to 'master'.\n source: <20220106214156.90967-1-jholdsworth@nvidia.com>\n\n\n* jh/p4-spawning-external-commands-cleanup (2022-01-06) 3 commits\n (merged to 'next' on 2022-01-10 at 54b36b4e66)\n + git-p4: don't print shell commands as python lists\n + git-p4: pass command arguments as lists instead of using shell\n + git-p4: don't select shell mode using the type of the command argument\n (this branch is used by jh/p4-various-fixups.)\n\n Will merge to 'master'.\n source: <20220106214035.90725-1-jholdsworth@nvidia.com>\n\n\n* pb/pull-rebase-autostash-fix (2022-01-14) 1 commit\n (merged to 'next' on 2022-01-14 at 83a388a7e2)\n + pull --rebase: honor rebase.autostash when fast-forwarding\n\n \"git pull --rebase\" ignored the rebase.autostash configuration\n variable when the remote history is a descendant of our history,\n which has been corrected.\n\n Will merge to 'master'.\n source: \n\n\n* rs/grep-expr-cleanup (2022-01-06) 4 commits\n (merged to 'next' on 2022-01-10 at b70a3bb0fa)\n + grep: use grep_and_expr() in compile_pattern_and()\n + grep: extract grep_binexp() from grep_or_expr()\n + grep: use grep_not_expr() in compile_pattern_not()\n + grep: use grep_or_expr() in compile_pattern_or()\n\n Code clean-up.\n\n Will merge to 'master'.\n source: \n\n\n* fs/ssh-signing-crlf (2022-01-07) 1 commit\n (merged to 'next' on 2022-01-19 at 76b86faafb)\n + gpg-interface: trim CR from ssh-keygen\n\n The code path that verifies signatures made with ssh were made to\n work better on a system with CRLF line endings.\n\n Will merge to 'master'.\n source: <20220107090735.580225-1-fs@gigacodes.de>\n\n\n* jc/qsort-s-alignment-fix (2022-01-07) 2 commits\n (merged to 'next' on 2022-01-10 at 329fd6e09a)\n + stable-qsort: avoid using potentially unaligned access\n + compat/qsort_s.c: avoid using potentially unaligned access\n\n Fix a hand-rolled alloca() imitation that may have violated\n alignment requirement of data being sorted in compatibility\n implementation of qsort_s() and stable qsort().\n\n Will merge to 'master'.\n source: \n source: \n\n\n* ps/avoid-unnecessary-hook-invocation-with-packed-refs (2022-01-17) 6 commits\n - refs: skip hooks when deleting uncovered packed refs\n - refs: do not execute reference-transaction hook on packing refs\n - refs: demonstrate excessive execution of the reference-transaction hook\n - refs: allow skipping the reference-transaction hook\n - refs: allow passing flags when beginning transactions\n - refs: extract packed_refs_delete_refs() to allow control of transaction\n\n Because a deletion of ref would need to remove it from both the\n loose ref store and the packed ref store, a delete-ref operation\n that logically removes one ref may end up invoking ref-transaction\n hook twice, which has been corrected.\n\n Will merge to 'next'?\n source: \n\n\n* rs/apply-symlinks-use-strset (2022-01-07) 1 commit\n (merged to 'next' on 2022-01-10 at 32497a67d5)\n + apply: use strsets to track symlinks\n\n \"git apply\" (ab)used the util pointer of the string-list to keep\n track of how each symbolic link needs to be handled, which has been\n simplified by using strset.\n\n Will merge to 'master'.\n source: <8739caad-aa3d-1f0f-b5dd-6174a8e059f6@web.de>\n\n\n* ld/sparse-index-bash-completion (2022-02-03) 3 commits\n . completion: handle unusual characters for sparse-checkout\n . completion: improve sparse-checkout cone mode directory completion\n . completion: address sparse-checkout issues\n\n The command line completion (in contrib/) learns to complete\n arguments give to \"git sparse-checkout\" command.\n\n Seems to break CI.\n source: \n\n\n* bc/clarify-eol-attr (2022-01-12) 2 commits\n - docs: correct documentation about eol attribute\n - t0027: add tests for eol without text in .gitattributes\n\n Doc and test update around the eol attribute.\n\n Will merge to 'next'.\n source: <20220111021507.531736-1-sandals@crustytoothpaste.net>\n\n\n* jz/rev-list-exclude-first-parent-only (2022-01-12) 1 commit\n - git-rev-list: add --exclude-first-parent-only flag\n\n \"git log\" and friends learned an option --exclude-first-parent-only\n to propagate UNINTERESTING bit down only along the first-parent\n chain, just like --first-parent option shows commits that lack the\n UNINTERESTING bit only along the first-parent chain.\n\n Will merge to 'next'.\n source: <20220111213941.30129-1-jerry@skydio.com>\n\n\n* en/present-despite-skipped (2022-01-14) 6 commits\n - Accelerate clear_skip_worktree_from_present_files() by caching\n - Update documentation related to sparsity and the skip-worktree bit\n - repo_read_index: clear SKIP_WORKTREE bit from files present in worktree\n - unpack-trees: fix accidental loss of user changes\n - t1011: add testcase demonstrating accidental loss of user modifications\n - Merge branch 'vd/sparse-clean-etc' into en/present-despite-skipped\n (this branch uses vd/sparse-clean-etc.)\n\n In sparse-checkouts, files mis-marked as missing from the working tree\n could lead to later problems. Such files were hard to discover, and\n harder to correct. Automatically detecting and correcting the marking\n of such files has been added to avoid these problems.\n\n Will merge to 'next'?\n source: \n\n\n* bc/csprng-mktemps (2022-01-17) 2 commits\n - wrapper: use a CSPRNG to generate random file names\n - wrapper: add a helper to generate numbers from a CSPRNG\n\n Pick a better random number generator and use it when we prepare\n temporary filenames.\n\n Will merge to 'next'?\n Are we solving the right problem?\n cf. <220118.86zgntpegy.gmgdl@evledraar.gmail.com>\n source: <20220117215617.843190-1-sandals@crustytoothpaste.net>\n\n\n* jc/reflog-parse-options (2022-01-10) 2 commits\n (merged to 'next' on 2022-01-12 at 1659e49c4b)\n + builtin/reflog.c: use parse-options api for expire, delete subcommands\n + Merge branch 'ab/reflog-prep' into jc/reflog-parse-options\n\n Use the parse-options API in \"git reflog\" command.\n\n Will merge to 'master'.\n source: \n\n\n* vd/sparse-clean-etc (2022-01-13) 9 commits\n - update-index: reduce scope of index expansion in do_reupdate\n - update-index: integrate with sparse index\n - update-index: add tests for sparse-checkout compatibility\n - checkout-index: integrate with sparse index\n - checkout-index: add --ignore-skip-worktree-bits option\n - checkout-index: expand sparse checkout compatibility tests\n - clean: integrate with sparse index\n - reset: reorder wildcard pathspec conditions\n - reset: fix validation in sparse index test\n (this branch is used by en/present-despite-skipped.)\n\n \"git update-index\", \"git checkout-index\", and \"git clean\" are\n taught to work better with the sparse checkout feature.\n\n Will merge to 'next'.\n source: \n\n\n* ms/update-index-racy (2022-01-07) 4 commits\n (merged to 'next' on 2022-01-14 at 705a33f63b)\n + update-index: refresh should rewrite index in case of racy timestamps\n + t7508: add tests capturing racy timestamp handling\n + t7508: fix bogus mtime verification\n + test-lib: introduce API for verifying file mtime\n\n \"git update-index --refresh\" has been taught to deal better with\n racy timestamps (just like \"git status\" already does).\n\n Will merge to 'master'.\n source: \n\n\n* jc/find-header (2022-01-06) 1 commit\n (merged to 'next' on 2022-01-10 at 8a13b4f0b3)\n + receive-pack.c: consolidate find header logic\n\n Code clean-up.\n\n Will merge to 'master'.\n source: \n\n\n* jc/name-rev-stdin (2022-01-10) 2 commits\n (merged to 'next' on 2022-01-19 at a58e05fabe)\n + name-rev.c: use strbuf_getline instead of limited size buffer\n + name-rev: deprecate --stdin in favor of --annotate-stdin\n\n \"git name-rev --stdin\" does not behave like usual \"--stdin\" at\n all. Start the process of renaming it to \"--annotate-stdin\".\n\n Will merge to 'master'.\n source: \n\n\n* en/remerge-diff (2022-02-02) 11 commits\n - diff-merges: avoid history simplifications when diffing merges\n - merge-ort: mark conflict/warning messages from inner merges as omittable\n - show, log: include conflict/warning messages in --remerge-diff headers\n - diff: add ability to insert additional headers for paths\n - merge-ort: format messages slightly different for use in headers\n - merge-ort: mark a few more conflict messages as omittable\n - merge-ort: capture and print ll-merge warnings in our preferred fashion\n - ll-merge: make callers responsible for showing warnings\n - log: clean unneeded objects during `log --remerge-diff`\n - show, log: provide a --remerge-diff capability\n - Merge branch 'ns/tmp-objdir' into en/remerge-diff\n (this branch is used by en/merge-tree.)\n\n \"git log --remerge-diff\" shows the difference from mechanical merge\n result and the merge result that is actually recorded.\n\n Will merge to 'next'?\n source: \n\n\n* bs/forbid-i18n-of-protocol-token-in-fetch-pack (2021-12-22) 2 commits\n - fixup! fetch-pack: parameterize message containing 'ready' keyword\n - fetch-pack: parameterize message containing 'ready' keyword\n\n L10n support for a few error messages.\n\n Expecting an ack for fixup.\n source: <20211222075805.19027-1-bagasdotme@gmail.com>\n\n\n* gc/branch-recurse-submodules (2022-02-01) 7 commits\n - branch.c: use 'goto cleanup' in setup_tracking() to fix memory leaks\n - branch: add --recurse-submodules option for branch creation\n - builtin/branch: consolidate action-picking logic in cmd_branch()\n - branch: add a dry_run parameter to create_branch()\n - branch: make create_branch() always create a branch\n - branch: move --set-upstream-to behavior to dwim_and_setup_tracking()\n - Merge branch 'js/branch-track-inherit' into gc/branch-recurse-submodules\n\n \"git branch\" learned the \"--recurse-submodules\" option.\n\n Will merge to 'next'.\n source: <20220129000446.99261-1-chooglen@google.com>\n\n\n* hn/reftable-coverity-fixes (2022-01-20) 17 commits\n - reftable: add print functions to the record types\n - reftable: make reftable_record a tagged union\n - reftable: remove outdated file reftable.c\n - reftable: implement record equality generically\n - reftable: make reftable-record.h function signatures const correct\n - reftable: handle null refnames in reftable_ref_record_equal\n - reftable: drop stray printf in readwrite_test\n - reftable: order unittests by complexity\n - reftable: all xxx_free() functions accept NULL arguments\n - reftable: fix resource warning\n - reftable: ignore remove() return value in stack_test.c\n - reftable: check reftable_stack_auto_compact() return value\n - reftable: fix resource leak blocksource.c\n - reftable: fix resource leak in block.c error path\n - reftable: fix OOB stack write in print functions\n - Merge branch 'hn/create-reflog-simplify' into hn/reftable-coverity-fixes\n - Merge branch 'hn/reftable' into hn/reftable-coverity-fixes\n\n Problems identified by Coverity in the reftable code have been\n corrected.\n\n Will merge to 'next'.\n source: \n\n\n* tb/midx-bitmap-corruption-fix (2022-01-27) 9 commits\n - pack-bitmap.c: gracefully fallback after opening pack/MIDX\n - midx: read `RIDX` chunk when present\n - t/lib-bitmap.sh: parameterize tests over reverse index source\n - t5326: move tests to t/lib-bitmap.sh\n - t5326: extract `test_rev_exists`\n - t5326: drop unnecessary setup\n - pack-revindex.c: instrument loading on-disk reverse index\n - midx.c: make changing the preferred pack safe\n - t5326: demonstrate bitmap corruption after permutation\n\n A bug that made multi-pack bitmap and the object order out-of-sync\n (hence the .midx data gets corrupted) has been fixed.\n\n Will merge to 'next'.\n source: \n\n\n* pw/fix-some-issues-in-reset-head (2022-01-26) 14 commits\n - rebase -m: don't fork git checkout\n - rebase --apply: set ORIG_HEAD correctly\n - rebase --apply: fix reflog\n - reset_head(): take struct rebase_head_opts\n - rebase: cleanup reset_head() calls\n - create_autostash(): remove unneeded parameter\n - reset_head(): make default_reflog_action optional\n - reset_head(): factor out ref updates\n - reset_head(): remove action parameter\n - rebase --apply: don't run post-checkout hook if there is an error\n - rebase: do not remove untracked files on checkout\n - rebase: pass correct arguments to post-checkout hook\n - t5403: refactor rebase post-checkout hook tests\n - rebase: factor out checkout for up to date branch\n\n Use an internal call to reset_head() helper function instead of\n spawning \"git checkout\" in \"rebase\", and update code paths that are\n involved in the change.\n\n Will merge to 'next'?\n May want to rename the topic branch to \"pw/use-in-process-checkout-in-rebase\"\n or something before doing so.\n source: \n\n\n* ab/cat-file (2022-01-12) 12 commits\n (merged to 'next' on 2022-01-12 at ee4d43041d)\n + cat-file: s/_/-/ in typo'd usage_msg_optf() message\n + cat-file: don't whitespace-pad \"(...)\" in SYNOPSIS and usage output\n (merged to 'next' on 2022-01-05 at e145efa605)\n + cat-file: use GET_OID_ONLY_TO_DIE in --(textconv|filters)\n + object-name.c: don't have GET_OID_ONLY_TO_DIE imply *_QUIETLY\n + cat-file: correct and improve usage information\n + cat-file: fix remaining usage bugs\n + cat-file: make --batch-all-objects a CMDMODE\n + cat-file: move \"usage\" variable to cmd_cat_file()\n + cat-file docs: fix SYNOPSIS and \"-h\" output\n + parse-options API: add a usage_msg_optf()\n + cat-file tests: test messaging on bad objects/paths\n + cat-file tests: test bad usage\n\n Assorted updates to \"git cat-file\", especially \"-h\".\n\n Will merge to 'master'.\n source: \n source: \n\n\n* ab/grep-patterntype (2022-01-27) 10 commits\n - SQUASH???\n - grep: simplify config parsing and option parsing\n - grep.c: do \"if (bool && memchr())\" not \"if (memchr() && bool)\"\n - grep.h: make \"grep_opt.pattern_type_option\" use its enum\n - grep API: call grep_config() after grep_init()\n - grep.c: don't pass along NULL callback value\n - built-ins: trust the \"prefix\" from run_builtin()\n - grep tests: add missing \"grep.patternType\" config tests\n - log tests: check if grep_config() is called by \"log\"-like cmds\n - grep.h: remove unused \"regex_t regexp\" from grep_opt\n\n Some code clean-up in the \"git grep\" machinery.\n\n Looking good, except for the last step.\n Code-wise, it is tempted to call it a victory after squashing the\n fix-up in, but that does not fix the proposed log message, so...\n source: \n\n\n* js/use-builtin-add-i (2021-12-01) 2 commits\n - add -i: default to the built-in implementation\n - t2016: require the PERL prereq only when necessary\n\n \"git add -i\" was rewritten in C some time ago and has been in\n testing; the reimplementation is now exposed to general public by\n default.\n\n On hold.\n There are known breakages on macOS.\n cf. \n source: \n\n\n* jt/conditional-config-on-remote-url (2022-01-18) 2 commits\n (merged to 'next' on 2022-01-19 at 3c2df266eb)\n + config: include file if remote URL matches a glob\n + config: make git_config_include() static\n\n The conditional inclusion mechanism of configuration files using\n \"[includeIf ]\" learns to base its decision on the\n URL of the remote repository the repository interacts with.\n\n Will merge to 'master'.\n source: \n\n\n* ab/ambiguous-object-name (2022-01-27) 7 commits\n - object-name: re-use \"struct strbuf\" in show_ambiguous_object()\n - object-name: iterate ambiguous objects before showing header\n - object-name: show date for ambiguous tag objects\n - object-name: make ambiguous object output translatable\n - object-name: explicitly handle bad tags in show_ambiguous_object()\n - object-name: explicitly handle OBJ_BAD in show_ambiguous_object()\n - object-name tests: add tests for ambiguous object blind spots\n\n Error output given in response to an ambiguous object name has been\n improved.\n\n What's the doneness of this thing?\n source: \n\n\n* tl/ls-tree-oid-only (2022-01-13) 9 commits\n - ls-tree.c: introduce \"--format\" option\n - cocci: allow padding with `strbuf_addf()`\n - ls-tree.c: introduce struct \"show_tree_data\"\n - ls-tree.c: support --object-only option for \"git-ls-tree\"\n - ls-tree: optimize naming and handling of \"return\" in show_tree()\n - ls-tree: use \"size_t\", not \"int\" for \"struct strbuf\"'s \"len\"\n - ls-tree: use \"enum object_type\", not {blob,tree,commit}_type\n - ls-tree: add missing braces to \"else\" arms\n - ls-tree: remove commented-out code\n\n \"git ls-tree\" learns \"--oid-only\" option, similar to \"--name-only\",\n and more generalized \"--format\" option.\n\n Will merge to 'next'?\n source: \n\n\n* ab/config-based-hooks-2 (2022-01-07) 17 commits\n (merged to 'next' on 2022-01-19 at 594b6da22c)\n + run-command: remove old run_hook_{le,ve}() hook API\n + receive-pack: convert push-to-checkout hook to hook.h\n + read-cache: convert post-index-change to use hook.h\n + commit: convert {pre-commit,prepare-commit-msg} hook to hook.h\n + git-p4: use 'git hook' to run hooks\n + send-email: use 'git hook run' for 'sendemail-validate'\n + git hook run: add an --ignore-missing flag\n + hooks: convert worktree 'post-checkout' hook to hook library\n + hooks: convert non-worktree 'post-checkout' hook to hook library\n + merge: convert post-merge to use hook.h\n + am: convert applypatch-msg to use hook.h\n + rebase: convert pre-rebase to use hook.h\n + hook API: add a run_hooks_l() wrapper\n + am: convert {pre,post}-applypatch to use hook.h\n + gc: use hook library for pre-auto-gc hook\n + hook API: add a run_hooks() wrapper\n + hook: add 'run' subcommand\n\n More \"config-based hooks\".\n\n Will merge to 'master'.\n source: \n\n\n* jh/builtin-fsmonitor-part2 (2021-12-25) 31 commits\n - fixup! t7527: create test for fsmonitor--daemon\n - fixup! t/perf/p7519: speed up test on Windows\n - t7527: test status with untracked-cache and fsmonitor--daemon\n - fsmonitor: force update index after large responses\n - fsmonitor--daemon: use a cookie file to sync with file system\n - fsmonitor--daemon: periodically truncate list of modified files\n - t/perf/p7519: add fsmonitor--daemon test cases\n - t/perf/p7519: speed up test on Windows\n - t/helper/test-chmtime: skip directories on Windows\n - t/perf: avoid copying builtin fsmonitor files into test repo\n - t7527: create test for fsmonitor--daemon\n - t/helper/fsmonitor-client: create IPC client to talk to FSMonitor Daemon\n - help: include fsmonitor--daemon feature flag in version info\n - fsmonitor--daemon: implement handle_client callback\n - compat/fsmonitor/fsm-listen-darwin: implement FSEvent listener on MacOS\n - compat/fsmonitor/fsm-listen-darwin: add macos header files for FSEvent\n - compat/fsmonitor/fsm-listen-win32: implement FSMonitor backend on Windows\n - fsmonitor--daemon: create token-based changed path cache\n - fsmonitor--daemon: define token-ids\n - fsmonitor--daemon: add pathname classification\n - fsmonitor--daemon: implement 'start' command\n - fsmonitor--daemon: implement 'run' command\n - compat/fsmonitor/fsm-listen-darwin: stub in backend for Darwin\n - compat/fsmonitor/fsm-listen-win32: stub in backend for Windows\n - fsmonitor--daemon: implement 'stop' and 'status' commands\n - fsmonitor--daemon: add a built-in fsmonitor daemon\n - fsmonitor: document builtin fsmonitor\n - fsmonitor: use IPC to query the builtin FSMonitor daemon\n - fsmonitor: config settings are repository-specific\n - fsmonitor-ipc: create client routines for git-fsmonitor--daemon\n - fsmonitor: enhance existing comments\n\n Built-in fsmonitor (part 2).\n\n Expecting a reroll.\n Seems that the discussion stalled.\n cf. \n source: \n\n\n* es/superproject-aware-submodules (2021-11-18) 5 commits\n - submodule: use config to find superproject worktree\n - submodule: record superproject gitdir during 'update'\n - submodule: record superproject gitdir during absorbgitdirs\n - introduce submodule.superprojectGitDir record\n - t7400-submodule-basic: modernize inspect() helper\n\n A configuration variable in a submodule points at the location of\n the superproject it is bound to (RFC).\n\n Expecting a reroll.\n cf. <20211117234300.2598132-1-jonathantanmy@google.com>\n source: <20211117005701.371808-1-emilyshaffer@google.com>\n\n\n* ab/only-single-progress-at-once (2022-01-07) 7 commits\n - *.c: use isatty(0|2), not isatty(STDIN_FILENO|STDERR_FILENO)\n - pack-bitmap-write.c: don't return without stop_progress()\n - progress.c: add temporary variable from progress struct\n - progress.c tests: test some invalid usage\n - progress.c tests: make start/stop commands on stdin\n - progress.c test helper: add missing braces\n - leak tests: fix a memory leak in \"test-progress\" helper\n\n Further tweaks on progress API.\n\n Getting there.\n source: \n"},{"id":"447710","messageId":"6916de1c-12f6-6f45-99c7-ffe8dd08b244@sunshineco.com","threadId":"57367","inReplyTo":"xmqqr18jnr2t.fsf@gitster.g","subject":"Re: What's cooking in git.git (Feb 2022, #01; Thu, 3)","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2022-02-04T07:00:18Z","receivedAt":"2022-02-04T07:00:23Z","isPatch":false,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On 2/4/22 12:22 AM, Junio C Hamano wrote:\n> * en/keep-cwd (2022-01-26) 1 commit\n> (merged to 'next' on 2022-01-26 at b2518a683c)\n> + sequencer, stash: fix running from worktree subdir\n> \n> Fix a regression in 2.35 that roke the use of \"rebase\" and \"stash\"\n> in a secondary worktree.\n\ns/roke/broke/\n"},{"id":"447711","messageId":"20220204081336.3194538-1-newren@gmail.com","threadId":"57367","inReplyTo":"xmqqr18jnr2t.fsf@gitster.g","subject":"Opinions on merging questions (Was: What's cooking in git.git (Feb 2022, #01; Thu, 3))","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2022-02-04T08:13:36Z","receivedAt":"2022-02-04T08:13:56Z","isPatch":false,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"Hi,\n\nI thought I'd respond to some of your questions with my opinion and\npointers, in case it's helpful...\n\n\nOn Fri, Feb 3, 2022 at 21:22 PM Junio C Hamano wrote:\n\n> * jc/doc-log-messages (2022-01-27) 3 commits\n> - SubmittingPatches: explain why we care about log messages\n> - CodingGuidelines: hint why we value clearly written log messages\n> - SubmittingPatches: write problem statement in the log in the present tense\n> \n> Update the contributor-facing documents on proposed log messages.\n> \n> Will merge to 'next'?\n> source: <20220126234205.2923388-1-gitster@pobox.com>\n\nI think it looks good.\n\n> * ds/sparse-checkout-requires-per-worktree-config (2022-01-31) 5 commits\n> - worktree: copy sparse-checkout patterns and config on add\n> - sparse-checkout: set worktree-config correctly\n> - config: add repo_config_set_worktree_gently()\n> - worktree: create init_worktree_config()\n> - Documentation: add extensions.worktreeConfig details\n> \n> \"git sparse-checkout\" wants to work with per-worktree configration,\n> but did not work well in a worktree attached to a bare repository.\n> \n> What's the doneness of this one?\n> source: \n\nI think it's done and ready for next.\n\nEric and I weighed in quite a bit on this series, and it changed\ndirection pretty dramatically, and more than once. But we eventually\nall came to an agreement about what should be done (the hard part),\nand this round implements it. Stolee has diligently fixed or answered\neach item I've raised and I'm very happy with this version.\n\n> * en/present-despite-skipped (2022-01-14) 6 commits\n> - Accelerate clear_skip_worktree_from_present_files() by caching\n> - Update documentation related to sparsity and the skip-worktree bit\n> - repo_read_index: clear SKIP_WORKTREE bit from files present in worktree\n> - unpack-trees: fix accidental loss of user changes\n> - t1011: add testcase demonstrating accidental loss of user modifications\n> - Merge branch 'vd/sparse-clean-etc' into en/present-despite-skipped\n> (this branch uses vd/sparse-clean-etc.)\n> \n> In sparse-checkouts, files mis-marked as missing from the working tree\n> could lead to later problems. Such files were hard to discover, and\n> harder to correct. Automatically detecting and correcting the marking\n> of such files has been added to avoid these problems.\n> \n> Will merge to 'next'?\n> source: \n\nVictoria says I've addressed all her feedback (\"Between the RFC and\nthis version, you've made the changes I was looking for and answered\nany remaining questions I had. This series...looks good to me.\")[*].\nNo one else has chimed in with any issues or questions. I'm probably\nbiased since it's my series, but I do think this one is ready.\n\n[*] https://lore.kernel.org/git/14b6dbeb-5a12-3ac0-9a0e-9cf2c3a381fe@github.com/\n\n(Sidenote: The series might look a little scary at first, since I was\noriginally worried with this series that I was going to need to\nintroduce some kind of backward compatibility break to get the\nnecessary fixes, or that the performance cost of the fix might be\nhigh, and there's a super lengthy commit message with rationale\nbecause of that. However, in the end both problems were averted and\nit just looks like a cheap and long-overdue fix, but I left the long\nrationale I had already written anyway.)\n\n> * en/remerge-diff (2022-02-02) 11 commits\n> - diff-merges: avoid history simplifications when diffing merges\n> - merge-ort: mark conflict/warning messages from inner merges as omittable\n> - show, log: include conflict/warning messages in --remerge-diff headers\n> - diff: add ability to insert additional headers for paths\n> - merge-ort: format messages slightly different for use in headers\n> - merge-ort: mark a few more conflict messages as omittable\n> - merge-ort: capture and print ll-merge warnings in our preferred fashion\n> - ll-merge: make callers responsible for showing warnings\n> - log: clean unneeded objects during `log --remerge-diff`\n> - show, log: provide a --remerge-diff capability\n> - Merge branch 'ns/tmp-objdir' into en/remerge-diff\n> (this branch is used by en/merge-tree.)\n> \n> \"git log --remerge-diff\" shows the difference from mechanical merge\n> result and the merge result that is actually recorded.\n> \n> Will merge to 'next'?\n> source: \n\nÆvar's recent opinion on the state of the series was \"I think this is\nway past good enough.\"[*]. He's the only reviewer that has commented\nsince December, leading me to believe the half-dozen or so other\nearlier reviewers since August are content with the current shape.\n\n[*] https://lore.kernel.org/git/220202.868rut8qkf.gmgdl@evledraar.gmail.com/\n\n\n> * pw/fix-some-issues-in-reset-head (2022-01-26) 14 commits\n> - rebase -m: don't fork git checkout\n> - rebase --apply: set ORIG_HEAD correctly\n> - rebase --apply: fix reflog\n> - reset_head(): take struct rebase_head_opts\n> - rebase: cleanup reset_head() calls\n> - create_autostash(): remove unneeded parameter\n> - reset_head(): make default_reflog_action optional\n> - reset_head(): factor out ref updates\n> - reset_head(): remove action parameter\n> - rebase --apply: don't run post-checkout hook if there is an error\n> - rebase: do not remove untracked files on checkout\n> - rebase: pass correct arguments to post-checkout hook\n> - t5403: refactor rebase post-checkout hook tests\n> - rebase: factor out checkout for up to date branch\n> \n> Use an internal call to reset_head() helper function instead of\n> spawning \"git checkout\" in \"rebase\", and update code paths that are\n> involved in the change.\n> \n> Will merge to 'next'?\n> May want to rename the topic branch to \"pw/use-in-process-checkout-in-rebase\"\n> or something before doing so.\n> source: \n\nThis series seems good to me and I think it's ready, but the topic\nbranch rename sounds good.\n"},{"id":"447712","messageId":"220204.86czk250zv.gmgdl@evledraar.gmail.com","threadId":"57367","inReplyTo":"20220204081336.3194538-1-newren@gmail.com","subject":"en/remerge-diff (was: Opinions on merging questions (Was: What's cooking in git.git (Feb 2022, #01; Thu, 3)))","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2022-02-04T11:20:04Z","receivedAt":"2022-02-04T11:23:37Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Fri, Feb 04 2022, Elijah Newren wrote:\n\n> On Fri, Feb 3, 2022 at 21:22 PM Junio C Hamano wrote:\n> [...]\n>> * en/remerge-diff (2022-02-02) 11 commits\n>> - diff-merges: avoid history simplifications when diffing merges\n>> - merge-ort: mark conflict/warning messages from inner merges as omittable\n>> - show, log: include conflict/warning messages in --remerge-diff headers\n>> - diff: add ability to insert additional headers for paths\n>> - merge-ort: format messages slightly different for use in headers\n>> - merge-ort: mark a few more conflict messages as omittable\n>> - merge-ort: capture and print ll-merge warnings in our preferred fashion\n>> - ll-merge: make callers responsible for showing warnings\n>> - log: clean unneeded objects during `log --remerge-diff`\n>> - show, log: provide a --remerge-diff capability\n>> - Merge branch 'ns/tmp-objdir' into en/remerge-diff\n>> (this branch is used by en/merge-tree.)\n>> \n>> \"git log --remerge-diff\" shows the difference from mechanical merge\n>> result and the merge result that is actually recorded.\n>> \n>> Will merge to 'next'?\n>> source: \n>\n> Ævar's recent opinion on the state of the series was \"I think this is\n> way past good enough.\"[*]. He's the only reviewer that has commented\n> since December, leading me to believe the half-dozen or so other\n> earlier reviewers since August are content with the current shape.\n>\n> [*] https://lore.kernel.org/git/220202.868rut8qkf.gmgdl@evledraar.gmail.com/\n\nYes, I'd really like to have this merged down. I didn't comment on your\nv4/v5 re-rolls but everything there looks good to me and addresses any\noutstanding comments I had (to the extent that they needed to be\naddressed at all).\n\nIn particular the small addition to the docs to give us a way out out if\nwe need to improve this in combination with other options is good, and\nmuch better than my proposed (and more verbose) version.\n\nThanks!\n"},{"id":"447713","messageId":"220204.868ruq50um.gmgdl@evledraar.gmail.com","threadId":"57367","inReplyTo":"xmqqr18jnr2t.fsf@gitster.g","subject":"jc/doc-log-messages (was: What's cooking in git.git (Feb 2022, #01; Thu, 3))","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2022-02-04T11:25:57Z","receivedAt":"2022-02-04T11:26:46Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Thu, Feb 03 2022, Junio C Hamano wrote:\n\n> * jc/doc-log-messages (2022-01-27) 3 commits\n> - SubmittingPatches: explain why we care about log messages\n> - CodingGuidelines: hint why we value clearly written log messages\n> - SubmittingPatches: write problem statement in the log in the present tense\n>\n> Update the contributor-facing documents on proposed log messages.\n>\n> Will merge to 'next'?\n> source: <20220126234205.2923388-1-gitster@pobox.com>\n\nI looked this over again now (after skimming it at the time), and all\nthose updates look good to me. Thanks for improving this part of the\ndocs.\n"},{"id":"447717","messageId":"220204.86r18i3jmh.gmgdl@evledraar.gmail.com","threadId":"57367","inReplyTo":"xmqqr18jnr2t.fsf@gitster.g","subject":"rj/receive-pack-abort-upon-disconnect (was: What's cooking in git.git (Feb 2022, #01; Thu, 3))","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2022-02-04T12:23:15Z","receivedAt":"2022-02-04T12:24:12Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Thu, Feb 03 2022, Junio C Hamano wrote:\n\n> * rj/receive-pack-abort-upon-disconnect (2022-01-28) 1 commit\n> - receive-pack: check if client is alive before completing the push\n>\n> \"git push\" may be killed by the user when the server side has\n> finished receiving all data and is about to commit the result.\n> Give the latter a better chance to notice such situation and abort\n> processing the ref updates.\n>\n> Will merge to 'next'?\n> source: <20220128194811.3396281-1-robin.jarry@6wind.com>\n\nI had some comments on the goals & possible bug/incompleteness just now:\nhttps://lore.kernel.org/git/220204.864k5e4yvf.gmgdl@evledraar.gmail.com/\n"},{"id":"447719","messageId":"220204.86mtj63jg5.gmgdl@evledraar.gmail.com","threadId":"57367","inReplyTo":"xmqqr18jnr2t.fsf@gitster.g","subject":"cb/clear-quarantine-early-on-all-ref-update-errors (was: What's cooking in git.git (Feb 2022, #01; Thu, 3))","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2022-02-04T12:25:26Z","receivedAt":"2022-02-04T12:27:59Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Thu, Feb 03 2022, Junio C Hamano wrote:\n\n> * cb/clear-quarantine-early-on-all-ref-update-errors (2022-02-01) 1 commit\n> - receive-pack: purge temporary data if no command is ready to run\n>\n> Check if \"receive-pack\" will do any ref updates (various conditions\n> could reject a push) before received objects are taken out of the\n> temporary directory used for quarantine purposes, so that a push\n> that is known-to-fail will not leave crufts that a future \"gc\"\n> needs to clean up.\n>\n> Will merge to 'next'?\n> source: <20220129063538.24038-1-bojun.cbj@gmail.com>\n\nAh, I see it's even in the same function as\nrj/receive-pack-abort-upon-disconnect. That's a very well reasoned &\nsensible isolated change. I think it's ready for \"next\".\n"},{"id":"447720","messageId":"220204.86iltu3jbm.gmgdl@evledraar.gmail.com","threadId":"57367","inReplyTo":"xmqqr18jnr2t.fsf@gitster.g","subject":"ja/i18n-common-messages (was: What's cooking in git.git (Feb 2022, #01; Thu, 3))","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2022-02-04T12:29:11Z","receivedAt":"2022-02-04T12:30:43Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Thu, Feb 03 2022, Junio C Hamano wrote:\n\n> * ja/i18n-common-messages (2022-01-31) 5 commits\n> - i18n: fix some misformated placeholders in command synopsis\n> - i18n: remove from i18n strings that do not hold translatable parts\n> - i18n: factorize \"invalid value\" messages\n> - SQUASH???\n> - i18n: factorize more 'incompatible options' messages\n>\n> Unify more messages to help l10n.\n>\n> Will merge to 'next' after squashing the fix-up in.\n> source: \n\nI had a comment on the API direction in parse-options.c, which I think\nshould be done differently, but I also think it would be fine to just\nchange it up later:\n\nhttps://lore.kernel.org/git/220201.86a6fa9tmr.gmgdl@evledraar.gmail.com/\n\nI replied to v2 instead of v4 due to some (now fixed) mail delays at the\ntime, but that comment still applies to the latest version.\n"},{"id":"447721","messageId":"220204.86ee4i3j5d.gmgdl@evledraar.gmail.com","threadId":"57367","inReplyTo":"xmqqr18jnr2t.fsf@gitster.g","subject":"ps/avoid-unnecessary-hook-invocation-with-packed-refs (was: What's cooking in git.git (Feb 2022, #01; Thu, 3))","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2022-02-04T12:31:53Z","receivedAt":"2022-02-04T12:34:27Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Thu, Feb 03 2022, Junio C Hamano wrote:\n\n> * ps/avoid-unnecessary-hook-invocation-with-packed-refs (2022-01-17) 6 commits\n> - refs: skip hooks when deleting uncovered packed refs\n> - refs: do not execute reference-transaction hook on packing refs\n> - refs: demonstrate excessive execution of the reference-transaction hook\n> - refs: allow skipping the reference-transaction hook\n> - refs: allow passing flags when beginning transactions\n> - refs: extract packed_refs_delete_refs() to allow control of transaction\n>\n> Because a deletion of ref would need to remove it from both the\n> loose ref store and the packed ref store, a delete-ref operation\n> that logically removes one ref may end up invoking ref-transaction\n> hook twice, which has been corrected.\n>\n> Will merge to 'next'?\n> source: \n\nI think so, I didn't reply but I consider the feedback I had on it fully\naddressed. In particular the \"is this the right direction?\" comment\nreplied to at https://lore.kernel.org/git/YeUhMPSlC%2FX6HRBF@ncase/\n\nI'm not digging it up now, but I think Han-Wen correctly noted that we\nhave a \"packed\" backend for no particular good reason, and much of that\nis die/stub functions, we should really just have a unified \"the file\nstuff\" backend.\n\nSo from an API perspective messaging upwards about loose->packed or\nwhatever is as irrelevant as having a psql backend and messaging about\nVACUUM, which is essentially paraphrasing what Patrick correctly points\nout there.\n"},{"id":"447722","messageId":"220204.86a6f63iyq.gmgdl@evledraar.gmail.com","threadId":"57367","inReplyTo":"xmqqr18jnr2t.fsf@gitster.g","subject":"ab/ambiguous-object-name (was: What's cooking in git.git (Feb 2022, #01; Thu, 3))","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2022-02-04T12:36:51Z","receivedAt":"2022-02-04T12:38:26Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Thu, Feb 03 2022, Junio C Hamano wrote:\n\n> * ab/ambiguous-object-name (2022-01-27) 7 commits\n> - object-name: re-use \"struct strbuf\" in show_ambiguous_object()\n> - object-name: iterate ambiguous objects before showing header\n> - object-name: show date for ambiguous tag objects\n> - object-name: make ambiguous object output translatable\n> - object-name: explicitly handle bad tags in show_ambiguous_object()\n> - object-name: explicitly handle OBJ_BAD in show_ambiguous_object()\n> - object-name tests: add tests for ambiguous object blind spots\n>\n> Error output given in response to an ambiguous object name has been\n> improved.\n>\n> What's the doneness of this thing?\n> source: \n\nI think it's thoroughly done at this point & ready for next, and the\nlatest (small) re-roll addressed the outstanding comments you had, which\nyou already acked. Thanks!\n"},{"id":"447724","messageId":"220204.861r0i3hmf.gmgdl@evledraar.gmail.com","threadId":"57367","inReplyTo":"xmqqr18jnr2t.fsf@gitster.g","subject":"tl/ls-tree-oid-only (was: What's cooking in git.git (Feb 2022, #01; Thu, 3))","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2022-02-04T13:05:06Z","receivedAt":"2022-02-04T13:07:24Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Thu, Feb 03 2022, Junio C Hamano wrote:\n\n> * tl/ls-tree-oid-only (2022-01-13) 9 commits\n> - ls-tree.c: introduce \"--format\" option\n> - cocci: allow padding with `strbuf_addf()`\n> - ls-tree.c: introduce struct \"show_tree_data\"\n> - ls-tree.c: support --object-only option for \"git-ls-tree\"\n> - ls-tree: optimize naming and handling of \"return\" in show_tree()\n> - ls-tree: use \"size_t\", not \"int\" for \"struct strbuf\"'s \"len\"\n> - ls-tree: use \"enum object_type\", not {blob,tree,commit}_type\n> - ls-tree: add missing braces to \"else\" arms\n> - ls-tree: remove commented-out code\n>\n> \"git ls-tree\" learns \"--oid-only\" option, similar to \"--name-only\",\n> and more generalized \"--format\" option.\n>\n> Will merge to 'next'?\n> source: \n\nLet's hold off on that. It'll need at least one more iteration, as I\nindicated just now in\nhttps://lore.kernel.org/git/220204.865ypu3hqm.gmgdl@evledraar.gmail.com/\n(and which the author agrees with).\n"},{"id":"447725","messageId":"220204.86wnia22rd.gmgdl@evledraar.gmail.com","threadId":"57367","inReplyTo":"xmqqr18jnr2t.fsf@gitster.g","subject":"ab/only-single-progress-at-once (was: What's cooking in git.git (Feb 2022, #01; Thu, 3))","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2022-02-04T13:11:58Z","receivedAt":"2022-02-04T13:13:47Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Thu, Feb 03 2022, Junio C Hamano wrote:\n\n> * ab/only-single-progress-at-once (2022-01-07) 7 commits\n> - *.c: use isatty(0|2), not isatty(STDIN_FILENO|STDERR_FILENO)\n> - pack-bitmap-write.c: don't return without stop_progress()\n> - progress.c: add temporary variable from progress struct\n> - progress.c tests: test some invalid usage\n> - progress.c tests: make start/stop commands on stdin\n> - progress.c test helper: add missing braces\n> - leak tests: fix a memory leak in \"test-progress\" helper\n>\n> Further tweaks on progress API.\n>\n> Getting there.\n> source: \n\nI sent a re-roll of this yesterday, which I'm only noting here in case\nyou missed it on account of me screwing up the In-Reply-Chain for that\ntopic (it traveled between v7..v8, including being attached to an\nunrelated thread for another topic of mine, oops!):\n\nhttps://lore.kernel.org/git/cover-v9-0.9-00000000000-20220203T213350Z-avarab@gmail.com/\n\nThat re-roll should address all the feedback René and Johannes\nAltmanningerhad on the v8.\n"},{"id":"447748","messageId":"xmqqee4ioa64.fsf@gitster.g","threadId":"57367","inReplyTo":"220204.86czk250zv.gmgdl@evledraar.gmail.com","subject":"Re: en/remerge-diff","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-02-04T16:42:43Z","receivedAt":"2022-02-04T16:42:47Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ævar Arnfjörð Bjarmason writes:\n\n> On Fri, Feb 04 2022, Elijah Newren wrote:\n>\n>> On Fri, Feb 3, 2022 at 21:22 PM Junio C Hamano wrote:\n>> [...]\n>>> * en/remerge-diff (2022-02-02) 11 commits\n> ..\n> Yes, I'd really like to have this merged down. I didn't comment on your\n> v4/v5 re-rolls but everything there looks good to me and addresses any\n> outstanding comments I had (to the extent that they needed to be\n> addressed at all).\n\nThanks, both, for your inputs (not just on this topic but also other\nones).\n\n"},{"id":"447749","messageId":"xmqqa6f6oa2b.fsf@gitster.g","threadId":"57367","inReplyTo":"220204.86mtj63jg5.gmgdl@evledraar.gmail.com","subject":"Re: cb/clear-quarantine-early-on-all-ref-update-errors","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-02-04T16:45:00Z","receivedAt":"2022-02-04T16:45:04Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ævar Arnfjörð Bjarmason writes:\n\n> On Thu, Feb 03 2022, Junio C Hamano wrote:\n>\n>> * cb/clear-quarantine-early-on-all-ref-update-errors (2022-02-01) 1 commit\n>> - receive-pack: purge temporary data if no command is ready to run\n>>\n>> Check if \"receive-pack\" will do any ref updates (various conditions\n>> could reject a push) before received objects are taken out of the\n>> temporary directory used for quarantine purposes, so that a push\n>> that is known-to-fail will not leave crufts that a future \"gc\"\n>> needs to clean up.\n>>\n>> Will merge to 'next'?\n>> source: <20220129063538.24038-1-bojun.cbj@gmail.com>\n>\n> Ah, I see it's even in the same function as\n> rj/receive-pack-abort-upon-disconnect. That's a very well reasoned &\n> sensible isolated change. I think it's ready for \"next\".\n\nI have a small comment on possible follow-on work, but that wouldn't\nbe a blocker. This seems to be a pure improvement.\n\nThanks.\n"},{"id":"447752","messageId":"xmqq5ypuo9it.fsf@gitster.g","threadId":"57367","inReplyTo":"220204.86iltu3jbm.gmgdl@evledraar.gmail.com","subject":"Re: ja/i18n-common-messages","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-02-04T16:56:42Z","receivedAt":"2022-02-04T16:56:48Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ævar Arnfjörð Bjarmason writes:\n\n> On Thu, Feb 03 2022, Junio C Hamano wrote:\n>\n>> * ja/i18n-common-messages (2022-01-31) 5 commits\n>> - i18n: fix some misformated placeholders in command synopsis\n>> - i18n: remove from i18n strings that do not hold translatable parts\n>> - i18n: factorize \"invalid value\" messages\n>> - SQUASH???\n>> - i18n: factorize more 'incompatible options' messages\n>>\n>> Unify more messages to help l10n.\n>>\n>> Will merge to 'next' after squashing the fix-up in.\n>> source: \n>\n> I had a comment on the API direction in parse-options.c, which I think\n> should be done differently, but I also think it would be fine to just\n> change it up later:\n>\n> https://lore.kernel.org/git/220201.86a6fa9tmr.gmgdl@evledraar.gmail.com/\n>\n> I replied to v2 instead of v4 due to some (now fixed) mail delays at the\n> time, but that comment still applies to the latest version.\n\nI do not think the change at the parse-options level would mix well\nwith what this topic wants to do. Large parts of the code this\nseries touches will have to be rewritten once again.\n\nIt will open us to new complaints we would not hear with this series\nfrom users who first say \"git cmd -a -b -c\", get stopped with \"a and\nb are incompatible\", then say \"git cmd -a -c\", get stopped again\nwith \"a and c are incompatible\", and utter \"well you could have told\nme upfront that these three are not to be used together\" in\nfrustration.\n\nI do not mind waiting for a few days to see what Jean-Noël would\nsay, but my take on this is that between starting from the current\ncode base and from the state after applying this series, there will\nnot be much difference in amount of the effort necessary to extend\nCMDMODE to mark and detect combinations of incompatible options at\nparse-options level. So I am inclined to merge this series down.\n\n\n"},{"id":"447817","messageId":"xmqq5yptlp4q.fsf@gitster.g","threadId":"57367","inReplyTo":"6916de1c-12f6-6f45-99c7-ffe8dd08b244@sunshineco.com","subject":"Re: What's cooking in git.git (Feb 2022, #01; Thu, 3)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-02-05T08:00:05Z","receivedAt":"2022-02-05T08:00:11Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Eric Sunshine writes:\n\n> On 2/4/22 12:22 AM, Junio C Hamano wrote:\n>> * en/keep-cwd (2022-01-26) 1 commit\n>> (merged to 'next' on 2022-01-26 at b2518a683c)\n>> + sequencer, stash: fix running from worktree subdir\n>> Fix a regression in 2.35 that roke the use of \"rebase\" and \"stash\"\n>> in a secondary worktree.\n>\n> s/roke/broke/\n\nThanks. I think I'll need to update the draft release notes as part\nof the next batch to merge topics to 'master'.\n"},{"id":"447823","messageId":"7408402.9NgVXbFLuH@cayenne","threadId":"57367","inReplyTo":"xmqq5ypuo9it.fsf@gitster.g","subject":"Re: ja/i18n-common-messages","fromName":"Jean-Noël AVILA","fromEmail":"jn.avila@free.fr","sentAt":"2022-02-05T12:18:37Z","receivedAt":"2022-02-05T12:18:45Z","isPatch":false,"sender":{"key":"jn.avila@free.fr","avatar":"https://avatars.githubusercontent.com/u/156172?v=4"},"body":"On Friday, 4 February 2022 17:56:42 CET Junio C Hamano wrote:\n> Ævar Arnfjörð Bjarmason writes:\n> \n> > On Thu, Feb 03 2022, Junio C Hamano wrote:\n> >\n> >> * ja/i18n-common-messages (2022-01-31) 5 commits\n> >> - i18n: fix some misformated placeholders in command synopsis\n> >> - i18n: remove from i18n strings that do not hold translatable parts\n> >> - i18n: factorize \"invalid value\" messages\n> >> - SQUASH???\n> >> - i18n: factorize more 'incompatible options' messages\n> >>\n> >> Unify more messages to help l10n.\n> >>\n> >> Will merge to 'next' after squashing the fix-up in.\n> >> source: \n> >\n> > I had a comment on the API direction in parse-options.c, which I think\n> > should be done differently, but I also think it would be fine to just\n> > change it up later:\n> >\n> > https://lore.kernel.org/git/220201.86a6fa9tmr.gmgdl@evledraar.gmail.com/\n> >\n> > I replied to v2 instead of v4 due to some (now fixed) mail delays at the\n> > time, but that comment still applies to the latest version.\n> \n> I do not think the change at the parse-options level would mix well\n> with what this topic wants to do. Large parts of the code this\n> series touches will have to be rewritten once again.\n> \n> It will open us to new complaints we would not hear with this series\n> from users who first say \"git cmd -a -b -c\", get stopped with \"a and\n> b are incompatible\", then say \"git cmd -a -c\", get stopped again\n> with \"a and c are incompatible\", and utter \"well you could have told\n> me upfront that these three are not to be used together\" in\n> frustration.\n> \n\nBad news: this implementation is already crippled. For instance, calling `git \ncommit --fixup -m -c` would first bring up:\n\"options '-c' and '--fixup' cannot be used together\"\nThen remove --fixup and you get\n\"options '-m' and '-c' cannot be used together\"\n\nThis is because (according to the code, I don't know if it's really what's \nwanted) the real logic is \nExclusive (\"-C\", \"-c\", \"-F\", Or(\"--fixup\", \"-m\"))\n\nThis is a lot more complex than what can be achieved with simple tests. \nDesigning a generic facility for this is quite an endeavour and the messages \nto guide the user precisely may need to be built with sentence lego, defeating \nthe initial purpose of this series about localization.\n\n> I do not mind waiting for a few days to see what Jean-Noël would\n> say, but my take on this is that between starting from the current\n> code base and from the state after applying this series, there will\n> not be much difference in amount of the effort necessary to extend\n> CMDMODE to mark and detect combinations of incompatible options at\n> parse-options level. So I am inclined to merge this series down.\n> \n\nAfter this series, \n * the messages are more precise, except in few edge cases\n * they can be localized and we can get new messages for free\n * the code is marginally easier to read\n\nWhile reformatting the code, a striking observation was that now that the \noption strings are extracted from the localizable parts, they are repeated all \naround the code, and this begs for another factorization, to make it dry.\n\nA new proposed framework would enhance greatly this third point, and I'm all \nfor it to happen, as long as it does not regress on the first two points. In \nthe mean time, this patch is the best I can propose.\n\n\n\n\n"},{"id":"447829","messageId":"032852b5-0cb3-4515-592c-9433930946f3@gmail.com","threadId":"57367","inReplyTo":"7408402.9NgVXbFLuH@cayenne","subject":"Re: ja/i18n-common-messages","fromName":"Bagas Sanjaya","fromEmail":"bagasdotme@gmail.com","sentAt":"2022-02-06T08:12:08Z","receivedAt":"2022-02-06T08:17:19Z","isPatch":false,"sender":{"key":"bagasdotme@gmail.com","avatar":"https://avatars.githubusercontent.com/u/40219486?v=4"},"body":"On 05/02/22 19.18, Jean-Noël AVILA wrote:\n> Bad news: this implementation is already crippled. For instance, calling `git\n> commit --fixup -m -c` would first bring up:\n> \"options '-c' and '--fixup' cannot be used together\"\n> Then remove --fixup and you get\n> \"options '-m' and '-c' cannot be used together\"\n> \n> This is because (according to the code, I don't know if it's really what's\n> wanted) the real logic is\n> Exclusive (\"-C\", \"-c\", \"-F\", Or(\"--fixup\", \"-m\"))\n\nI read that your intended logic as 'options \"-c\", \"-m\", and '--fixup' cannot\nbe used together', right?\n\n-- \nAn old man doll... just what I always wanted! - Clara\n"},{"id":"447833","messageId":"6114905.tHSIdXRuFm@cayenne","threadId":"57367","inReplyTo":"032852b5-0cb3-4515-592c-9433930946f3@gmail.com","subject":"Re: ja/i18n-common-messages","fromName":"Jean-Noël AVILA","fromEmail":"jn.avila@free.fr","sentAt":"2022-02-06T10:03:52Z","receivedAt":"2022-02-06T10:04:00Z","isPatch":false,"sender":{"key":"jn.avila@free.fr","avatar":"https://avatars.githubusercontent.com/u/156172?v=4"},"body":"On Sunday, 6 February 2022 09:12:08 CET Bagas Sanjaya wrote:\n> On 05/02/22 19.18, Jean-Noël AVILA wrote:\n> > Bad news: this implementation is already crippled. For instance, calling `git\n> > commit --fixup -m -c` would first bring up:\n> > \"options '-c' and '--fixup' cannot be used together\"\n> > Then remove --fixup and you get\n> > \"options '-m' and '-c' cannot be used together\"\n> > \n> > This is because (according to the code, I don't know if it's really what's\n> > wanted) the real logic is\n> > Exclusive (\"-C\", \"-c\", \"-F\", Or(\"--fixup\", \"-m\"))\n> \n> I read that your intended logic as 'options \"-c\", \"-m\", and '--fixup' cannot\n> be used together', right?\n> \n> \n\nIn such case, in a perfect UI, I would expect more something along \n\"option '-C' cannot be used with '--fixup' and '-m'\" \n\n\n\n"},{"id":"447840","messageId":"CAPig+cRrRxuTeByhKkLs_KDaWY8-r4+jrwT83A-r+sBQsmebMw@mail.gmail.com","threadId":"57367","inReplyTo":"20220204081336.3194538-1-newren@gmail.com","subject":"Re: Opinions on merging questions (Was: What's cooking in git.git (Feb 2022, #01; Thu, 3))","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2022-02-06T11:41:08Z","receivedAt":"2022-02-06T11:52:56Z","isPatch":false,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Fri, Feb 4, 2022 at 7:06 AM Elijah Newren wrote:\n> On Fri, Feb 3, 2022 at 21:22 PM Junio C Hamano wrote:\n> > * ds/sparse-checkout-requires-per-worktree-config (2022-01-31) 5 commits\n> > - worktree: copy sparse-checkout patterns and config on add\n> > - sparse-checkout: set worktree-config correctly\n> > - config: add repo_config_set_worktree_gently()\n> > - worktree: create init_worktree_config()\n> > - Documentation: add extensions.worktreeConfig details\n> >\n> > What's the doneness of this one?\n> > source: \n>\n> I think it's done and ready for next.\n>\n> Eric and I weighed in quite a bit on this series, and it changed\n> direction pretty dramatically, and more than once. But we eventually\n> all came to an agreement about what should be done (the hard part),\n> and this round implements it. Stolee has diligently fixed or answered\n> each item I've raised and I'm very happy with this version.\n\nThis version is much improved over earlier versions, and I think\neveryone is in agreement now that the series is \"doing the right\nthing\". However...\n\nI just finished reviewing this round and left a bunch of comments.\nSome of the comments are minor and wouldn't warrant a reroll, but I\nalso identified some memory leaks and fragile code, as well as\nnon-obvious test code which could be improved. The commit message of\n[4/5] feels too weak for future readers by not fully explaining the\nproblem(s) that the patch is addressing, so I suggested a possible\nrewrite of the message. All of these issues could be fixed by\nfollow-on patches (with the exception of the weak commit message),\nhowever, taken together it feels like one more reroll is warranted.\n"},{"id":"447886","messageId":"fcba4c20-c29c-c114-c1ca-ac61b9725827@gmail.com","threadId":"57367","inReplyTo":"20220204081336.3194538-1-newren@gmail.com","subject":"Re: Opinions on merging questions (Was: What's cooking in git.git (Feb 2022, #01; Thu, 3))","fromName":"Phillip Wood","fromEmail":"phillip.wood123@gmail.com","sentAt":"2022-02-07T14:11:24Z","receivedAt":"2022-02-07T14:29:58Z","isPatch":false,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"On 04/02/2022 08:13, Elijah Newren wrote:\n> Hi,\n> \n> I thought I'd respond to some of your questions with my opinion and\n> pointers, in case it's helpful...\n> \n>> * pw/fix-some-issues-in-reset-head (2022-01-26) 14 commits\n>> - rebase -m: don't fork git checkout\n>> - rebase --apply: set ORIG_HEAD correctly\n>> - rebase --apply: fix reflog\n>> - reset_head(): take struct rebase_head_opts\n>> - rebase: cleanup reset_head() calls\n>> - create_autostash(): remove unneeded parameter\n>> - reset_head(): make default_reflog_action optional\n>> - reset_head(): factor out ref updates\n>> - reset_head(): remove action parameter\n>> - rebase --apply: don't run post-checkout hook if there is an error\n>> - rebase: do not remove untracked files on checkout\n>> - rebase: pass correct arguments to post-checkout hook\n>> - t5403: refactor rebase post-checkout hook tests\n>> - rebase: factor out checkout for up to date branch\n>>\n>> Use an internal call to reset_head() helper function instead of\n>> spawning \"git checkout\" in \"rebase\", and update code paths that are\n>> involved in the change.\n>>\n>> Will merge to 'next'?\n>> May want to rename the topic branch to \"pw/use-in-process-checkout-in-rebase\"\n>> or something before doing so.\n>> source: \n> \n> This series seems good to me and I think it's ready, but the topic\n> branch rename sounds good.\n\nThanks for looking at the latest version. I think it is ready for next. \nÆvar suggested using a designated initialize in the conversion of \nreset_head() to take a struct but I think that makes it harder to review \nthe conversion c.f. <7b56e91b-a7c9-b7cb-356c-e9615b9459fa@gmail.com>. He \nseemed to be happy with the rest of the series.\n\nBest Wishes\n\nPhillip\n\n"},{"id":"448048","messageId":"fe2346f0-f65a-6c09-e2dc-f8c4e163a2b4@gmail.com","threadId":"57367","inReplyTo":"CAPig+cRrRxuTeByhKkLs_KDaWY8-r4+jrwT83A-r+sBQsmebMw@mail.gmail.com","subject":"Re: Opinions on merging questions (Was: What's cooking in git.git (Feb 2022, #01; Thu, 3))","fromName":"Derrick Stolee","fromEmail":"stolee@gmail.com","sentAt":"2022-02-09T14:57:24Z","receivedAt":"2022-02-09T14:57:34Z","isPatch":false,"sender":{"key":"stolee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/570044?v=4"},"body":"On 2/6/2022 6:41 AM, Eric Sunshine wrote:\n> On Fri, Feb 4, 2022 at 7:06 AM Elijah Newren wrote:\n>> On Fri, Feb 3, 2022 at 21:22 PM Junio C Hamano wrote:\n>>> * ds/sparse-checkout-requires-per-worktree-config (2022-01-31) 5 commits\n>>> - worktree: copy sparse-checkout patterns and config on add\n>>> - sparse-checkout: set worktree-config correctly\n>>> - config: add repo_config_set_worktree_gently()\n>>> - worktree: create init_worktree_config()\n>>> - Documentation: add extensions.worktreeConfig details\n>>>\n>>> What's the doneness of this one?\n>>> source: \n>>\n>> I think it's done and ready for next.\n>>\n>> Eric and I weighed in quite a bit on this series, and it changed\n>> direction pretty dramatically, and more than once. But we eventually\n>> all came to an agreement about what should be done (the hard part),\n>> and this round implements it. Stolee has diligently fixed or answered\n>> each item I've raised and I'm very happy with this version.\n> \n> This version is much improved over earlier versions, and I think\n> everyone is in agreement now that the series is \"doing the right\n> thing\". However...\n> \n> I just finished reviewing this round and left a bunch of comments.\n> Some of the comments are minor and wouldn't warrant a reroll, but I\n> also identified some memory leaks and fragile code, as well as\n> non-obvious test code which could be improved. The commit message of\n> [4/5] feels too weak for future readers by not fully explaining the\n> problem(s) that the patch is addressing, so I suggested a possible\n> rewrite of the message. All of these issues could be fixed by\n> follow-on patches (with the exception of the weak commit message),\n> however, taken together it feels like one more reroll is warranted.\n\n(I finally got these emails delivered to GMail today...)\n\nI sent v6 since this message.\n\nThere are some further comments by Junio and Jean-Noël that will\nrequire another re-roll. There is time for more review before then,\nso I will wait until next week to see if more comments come in.\n\nThanks,\n-Stolee\n"}]}