{"thread":{"id":"56737","subject":"What's cooking in git.git (Oct 2021, #05; Mon, 18)","startedAt":"2021-10-19T06:48:10Z","lastAt":"2021-10-27T23:56:12Z","messageCount":13,"participants":["Junio C Hamano","Johannes Schindelin","Johannes Sixt","Glen Choo","Ævar Arnfjörð Bjarmason","Emily Shaffer"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"439016","messageId":"xmqq1r4hv7bv.fsf@gitster.g","threadId":"56737","inReplyTo":null,"subject":"What's cooking in git.git (Oct 2021, #05; Mon, 18)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-10-19T06:48:04Z","receivedAt":"2021-10-19T06:48:10Z","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\nThe fourteenth batch of topics are in 'master'.  It has only been\njust a few days since the last batch, but I'd be offline tomorrow\n(a forced day-off), so I'm merging them a bit earlier.\n\nI expect that things will start to calm down in preparation for the\nrelease expected in mid November.  Topics that are not marked with\nany plans may be in that status because they didn't get much\nattention by reviewers, in which case you folks know what to do ;-)\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* ab/align-parse-options-help (2021-09-22) 4 commits\n  (merged to 'next' on 2021-10-06 at e22da7ef85)\n + parse-options: properly align continued usage output\n + git rev-parse --parseopt tests: add more usagestr tests\n + send-pack: properly use parse_options() API for usage string\n + parse-options API users: align usage output in C-strings\n\n When \"git cmd -h\" shows more than one line of usage text (e.g.\n the cmd subcommand may take sub-sub-command), parse-options API\n learned to align these lines, even across i18n/l10n.\n\n\n* ab/config-based-hooks-1 (2021-09-27) 8 commits\n  (merged to 'next' on 2021-10-06 at d05325ed35)\n + hook-list.h: add a generated list of hooks, like config-list.h\n + hook.c users: use \"hook_exists()\" instead of \"find_hook()\"\n + hook.c: add a hook_exists() wrapper and use it in bugreport.c\n + hook.[ch]: move find_hook() from run-command.c to hook.c\n + Makefile: remove an out-of-date comment\n + Makefile: don't perform \"mv $@+ $@\" dance for $(GENERATED_H)\n + Makefile: stop hardcoding {command,config}-list.h\n + Makefile: mark \"check\" target as .PHONY\n (this branch is used by ab/config-based-hooks-2.)\n\n Mostly preliminary clean-up in the hook API.\n\n\n* ab/designated-initializers-more (2021-10-01) 6 commits\n  (merged to 'next' on 2021-10-11 at 9b9836c3df)\n + builtin/remote.c: add and use SHOW_INFO_INIT\n + builtin/remote.c: add and use a REF_STATES_INIT\n + urlmatch.[ch]: add and use URLMATCH_CONFIG_INIT\n + builtin/blame.c: refactor commit_info_init() to COMMIT_INFO_INIT macro\n + daemon.c: refactor hostinfo_init() to HOSTINFO_INIT macro\n + Merge branch 'ab/designated-initializers' into ab/designated-initializers-more\n\n Code clean-up.\n\n\n* ab/help-config-vars (2021-09-23) 9 commits\n  (merged to 'next' on 2021-10-06 at bf9538cfbd)\n + help: move column config discovery to help.c library\n + help / completion: make \"git help\" do the hard work\n + help tests: test --config-for-completion option & output\n + help: simplify by moving to OPT_CMDMODE()\n + help: correct logic error in combining --all and --guides\n + help: correct logic error in combining --all and --config\n + help tests: add test for --config output\n + help: correct usage & behavior of \"git help --guides\"\n + help: correct the usage string in -h and documentation\n\n Teach \"git help -c\" into helping the command line completion of\n configuration variables.\n\n\n* ab/lib-subtest (2021-09-22) 9 commits\n  (merged to 'next' on 2021-10-06 at e8fa261811)\n + test-lib tests: get rid of copy/pasted mock test code\n + test-lib tests: assert 1 exit code, not non-zero\n + test-lib tests: refactor common part of check_sub_test_lib_test*()\n + test-lib tests: avoid subshell for \"test_cmp\" for readability\n + test-lib tests: don't provide a description for the sub-tests\n + test-lib tests: split up \"write and run\" into two functions\n + test-lib tests: move \"run_sub_test\" to a new lib-subtest.sh\n + Merge branch 'ps/t0000-output-directory-fix' into ab/lib-subtest\n + Merge branch 'jk/t0000-subtests-fix' into ab/lib-subtest\n\n Updates to the tests in t0000 to test the test framework.\n\n\n* ab/make-sparse-for-real (2021-09-22) 1 commit\n  (merged to 'next' on 2021-10-06 at 10e3c31d6a)\n + Makefile: make the \"sparse\" target non-.PHONY\n\n Prevent \"make sparse\" from running for the source files that\n haven't been modified.\n\n\n* bs/doc-blame-color-lines (2021-10-08) 2 commits\n  (merged to 'next' on 2021-10-11 at a2cb7768b6)\n + blame: document --color-* options\n + blame: describe default output format\n\n The \"--color-lines\" and \"--color-by-age\" options of \"git blame\"\n have been missing, which are now documented.\n\n\n* cm/save-restore-terminal (2021-10-06) 2 commits\n  (merged to 'next' on 2021-10-11 at 962bb3e75b)\n + editor: save and reset terminal after calling EDITOR\n + terminal: teach git how to save/restore its terminal settings\n\n An editor session launched during a Git operation (e.g. during 'git\n commit') can leave the terminal in a funny state.  The code path\n has updated to save the terminal state before, and restore it\n after, it spawns an editor.\n\n\n* ds/add-rm-with-sparse-index (2021-09-28) 13 commits\n  (merged to 'next' on 2021-10-06 at 80a9cda797)\n + advice: update message to suggest '--sparse'\n + mv: refuse to move sparse paths\n + rm: skip sparse paths with missing SKIP_WORKTREE\n + rm: add --sparse option\n + add: update --renormalize to skip sparse paths\n + add: update --chmod to skip sparse paths\n + add: implement the --sparse option\n + add: skip tracked paths outside sparse-checkout cone\n + add: fail when adding an untracked sparse file\n + dir: fix pattern matching on dirs\n + dir: select directories correctly\n + t1092: behavior for adding sparse files\n + t3705: test that 'sparse_entry' is unstaged\n\n \"git add\", \"git mv\", and \"git rm\" have been adjusted to avoid\n updating paths outside of the sparse-checkout definition unless\n the user specifies a \"--sparse\" option.\n\n\n* en/removing-untracked-fixes (2021-09-27) 12 commits\n  (merged to 'next' on 2021-10-06 at fc4e387fda)\n + Documentation: call out commands that nuke untracked files/directories\n + Comment important codepaths regarding nuking untracked files/dirs\n + unpack-trees: avoid nuking untracked dir in way of locally deleted file\n + unpack-trees: avoid nuking untracked dir in way of unmerged file\n + Change unpack_trees' 'reset' flag into an enum\n + Remove ignored files by default when they are in the way\n + unpack-trees: make dir an internal-only struct\n + unpack-trees: introduce preserve_ignored to unpack_trees_options\n + read-tree, merge-recursive: overwrite ignored files by default\n + checkout, read-tree: fix leak of unpack_trees_options.dir\n + t2500: add various tests for nuking untracked files\n + Merge branch 'en/am-abort-fix' into en/removing-untracked-fixes\n\n Various fixes in code paths that move untracked files away to make room.\n\n\n* ja/doc-status-types-and-copies (2021-10-04) 4 commits\n  (merged to 'next' on 2021-10-06 at 4de6571bf7)\n + Documentation/git-status: mention how to detect copies\n + Documentation/git-status: document porcelain status T (typechange)\n + Documentation/diff-format: state in which cases porcelain status is T\n + Documentation/git-status: remove impossible porcelain status DR and DC\n\n A few kinds of changes \"git status\" can show were not documented.\n\n\n* jh/builtin-fsmonitor-part1 (2021-09-20) 7 commits\n  (merged to 'next' on 2021-10-06 at 021f633b9c)\n + t/helper/simple-ipc: convert test-simple-ipc to use start_bg_command\n + run-command: create start_bg_command\n + simple-ipc/ipc-win32: add Windows ACL to named pipe\n + simple-ipc/ipc-win32: add trace2 debugging\n + simple-ipc: move definition of ipc_active_state outside of ifdef\n + simple-ipc: preparations for supporting binary messages.\n + trace2: add trace2_child_ready() to report on background children\n\n Built-in fsmonitor (part 1).\n\n\n* jk/cat-file-batch-all-wo-replace (2021-10-08) 5 commits\n  (merged to 'next' on 2021-10-11 at 9415f7c43a)\n + cat-file: use packed_object_info() for --batch-all-objects\n + cat-file: split ordered/unordered batch-all-objects callbacks\n + cat-file: disable refs/replace with --batch-all-objects\n + cat-file: mention --unordered along with --batch-all-objects\n + t1006: clean up broken objects\n\n \"git cat-file --batch\" with the \"--batch-all-objects\" option is\n supposed to iterate over all the objects found in a repository, but\n it used to translate these object names using the replace mechanism,\n which defeats the point of enumerating all objects in the repository.\n This has been corrected.\n\n\n* js/retire-preserve-merges (2021-09-07) 11 commits\n  (merged to 'next' on 2021-09-10 at f645ffd7a3)\n + sequencer: restrict scope of a formerly public function\n + rebase: remove a no-longer-used function\n + rebase: stop mentioning the -p option in comments\n + rebase: remove obsolete code comment\n + rebase: drop the internal `rebase--interactive` command\n + git-svn: drop support for `--preserve-merges`\n + rebase: drop support for `--preserve-merges`\n + pull: remove support for `--rebase=preserve`\n + tests: stop testing `git rebase --preserve-merges`\n + remote: warn about unhandled branch.<name>.rebase values\n + t5520: do not use `pull.rebase=preserve`\n\n The \"--preserve-merges\" option of \"git rebase\" has been removed.\n\n\n* js/windows-ci-path-fix (2021-10-13) 1 commit\n  (merged to 'next' on 2021-10-14 at 3047fe56fc)\n + ci(windows): ensure that we do not pick up random executables\n\n The PATH used in CI job may be too wide and let incompatible dlls\n to be grabbed, which can cause the build&test to fail.  Tighten it.\n\n\n* mt/grep-submodule-textconv (2021-09-29) 1 commit\n  (merged to 'next' on 2021-10-06 at 1950944b8c)\n + grep: demonstrate bug with textconv attributes and submodules\n\n \"git grep --recurse-submodules\" takes trees and blobs from the\n submodule repository, but the textconv settings when processing a\n blob from the submodule is not taken from the submodule repository.\n A test is added to demonstrate the issue, without fixing it.\n\n\n* rs/make-verify-path-really-verify-again (2021-10-07) 3 commits\n  (merged to 'next' on 2021-10-11 at 6b4358876f)\n + read-cache: let verify_path() reject trailing dir separators again\n + read-cache: add verify_path_internal()\n + t3905: show failure to ignore sub-repo\n\n Recent sparse-index work broke safety against attempts to add paths\n with trailing slashes to the index, which has been corrected.\n\n\n* rs/mergesort (2021-10-08) 10 commits\n  (merged to 'next' on 2021-10-08 at 2e83706316)\n + test-mergesort: use repeatable random numbers\n  (merged to 'next' on 2021-10-03 at 29a672574f)\n + mergesort: use ranks stack\n + p0071: test performance of llist_mergesort()\n + p0071: measure sorting of already sorted and reversed files\n + test-mergesort: add unriffle_skewed mode\n + test-mergesort: add unriffle mode\n + test-mergesort: add generate subcommand\n + test-mergesort: add test subcommand\n + test-mergesort: add sort subcommand\n + test-mergesort: use strbuf_getline()\n\n The mergesort implementation used to sort linked list has been\n optimized.\n\n\n* tb/repack-write-midx (2021-10-07) 10 commits\n  (merged to 'next' on 2021-10-08 at ff8fec247e)\n + test-read-midx: fix leak of bitmap_index struct\n  (merged to 'next' on 2021-10-06 at ccdd5aaf2a)\n + builtin/repack.c: pass `--refs-snapshot` when writing bitmaps\n + builtin/repack.c: make largest pack preferred\n + builtin/repack.c: support writing a MIDX while repacking\n + builtin/repack.c: extract showing progress to a variable\n + builtin/repack.c: rename variables that deal with non-kept packs\n + builtin/repack.c: keep track of existing packs unconditionally\n + midx: preliminary support for `--refs-snapshot`\n + builtin/multi-pack-index.c: support `--stdin-packs` mode\n + midx: expose `write_midx_file_only()` publicly\n (this branch is used by tb/fix-midx-rename-while-mapped.)\n\n \"git repack\" has been taught to generate multi-pack reachability\n bitmaps.\n\n\n* tz/doc-link-to-bundle-format-fix (2021-10-13) 1 commit\n  (merged to 'next' on 2021-10-14 at dee8053d49)\n + doc: add bundle-format to TECH_DOCS\n\n Doc update.\n\n--------------------------------------------------\n[New Topics]\n\n* ab/fix-commit-error-message-upon-unwritable-object-store (2021-10-12) 2 commits\n  (merged to 'next' on 2021-10-14 at 08c52f5cd5)\n + commit: fix duplication regression in permission error output\n + unwritable tests: assert exact error output\n\n \"git commit\" gave duplicated error message when the object store\n was unwritable, which has been corrected.\n\n Will merge to 'master'.\n\n\n* rs/disable-gc-during-perf-tests (2021-10-11) 1 commit\n  (merged to 'next' on 2021-10-14 at e0dd4b9bd4)\n + perf: disable automatic housekeeping\n\n Avoid performance measurements from getting ruined by gc and other\n housekeeping pauses interfering in the middle.\n\n Will merge to 'master'.\n\n\n* gc/remote-with-fewer-static-global-variables (2021-10-13) 3 commits\n - remote: add struct repository parameter to external functions\n - remote: use remote_state parameter internally\n - remote: move static variables into per-repository struct\n\n Code clean-up to eventually allow information on remotes defined\n for an arbitrary repository to be read.\n\n Will merge to 'next'?\n\n\n* jk/loosen-urlmatch (2021-10-12) 1 commit\n - urlmatch: add underscore to URL_HOST_CHARS\n\n Treat \"_\" as any other DNS-valid characters in an URL when matching\n the per-URL configuration variable names.\n\n Will merge to 'next'?\n\n\n* rs/add-dry-run-without-objects (2021-10-12) 1 commit\n  (merged to 'next' on 2021-10-14 at a42928e134)\n + add: don't write objects with --dry-run\n\n Stop \"git add --dry-run\" from creating new blob and tree objects.\n\n Will merge to 'master'.\n\n\n* ab/test-bail (2021-10-14) 2 commits\n - test-lib.sh: use \"Bail out!\" syntax on bad SANITIZE=leak use\n - test-lib.sh: de-duplicate error() teardown code\n\n A new feature has been added to abort early in the test framework.\n\n Will merge to 'next'.\n\n\n* ab/config-based-hooks-2 (2021-10-15) 14 commits\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 - merge: convert post-merge to use hook.h\n - hooks: convert 'post-checkout' hook to hook library\n - am: convert applypatch to use hook.h\n - rebase: convert pre-rebase to use hook.h\n - gc: use hook library for pre-auto-gc hook\n - hook: add 'run' subcommand\n - Merge branch 'ab/config-based-hooks-1' into ab/config-based-hooks-2\n\n More \"config-based hooks\".\n\n Breaks t2400.\n\n\n* ab/fix-make-lint-docs (2021-10-15) 4 commits\n  (merged to 'next' on 2021-10-18 at 22ebb3213f)\n + doc lint: make \"lint-docs\" non-.PHONY\n + doc build: speed up \"make lint-docs\"\n + doc lint: emit errors on STDERR\n + doc lint: fix error-hiding regression\n\n Build fix.\n\n Will merge to 'master'.\n\n\n* ab/ignore-replace-while-working-on-commit-graph (2021-10-15) 3 commits\n - commit-graph: don't consider \"replace\" objects with \"verify\"\n - commit-graph tests: fix another graph_git_two_modes() helper\n - commit-graph tests: fix error-hiding graph_git_two_modes() helper\n (this branch is used by gc/use-repo-settings.)\n\n Teach \"git commit-graph\" command not to allow using replace objects\n at all, as we do not use the commit-graph at runtime when we see\n object replacement.\n\n Will merge to 'next'?\n\n\n* ab/pkt-line-cleanup (2021-10-15) 2 commits\n  (merged to 'next' on 2021-10-18 at 79b07663da)\n + pkt-line.[ch]: remove unused packet_read_line_buf()\n + pkt-line.[ch]: remove unused packet_buf_write_len()\n\n Code clean-up.\n\n Will merge to 'master'.\n\n\n* ab/test-lib-diff-cleanup (2021-10-15) 2 commits\n  (merged to 'next' on 2021-10-18 at 5229c5d01d)\n + tests: stop using top-level \"README\" and \"COPYING\" files\n + \"lib-diff\" tests: make \"README\" and \"COPYING\" test data smaller\n\n Test clean-up.\n\n Will merge to 'master'.\n\n\n* so/stash-staged (2021-10-18) 1 commit\n - stash: implement '--staged' option for 'push' and 'save'\n\n \"git stash\" learned the \"--staged\" option to stash away what has\n been added to the index (and nothing else).\n\n Will merge to 'next'?\n\n\n* tb/fix-midx-rename-while-mapped (2021-10-15) 5 commits\n  (merged to 'next' on 2021-10-18 at 52e552caae)\n + midx.c: guard against commit_lock_file() failures\n + midx.c: lookup MIDX by object directory during repack\n + midx.c: lookup MIDX by object directory during expire\n + midx.c: extract MIDX lookup by object_dir\n + Merge branch 'tb/repack-write-midx' into tb/fix-midx-rename-while-mapped\n\n The codepath to write a new version of .midx multi-pack index files\n has learned to release the mmaped memory holding the current\n version of .midx before removing them from the disk, as some\n platforms do not allow removal of a file that still has mapping.\n\n Will merge to 'master'.\n\n\n* vd/sparse-sparsity-fix-on-read (2021-10-15) 2 commits\n - sparse-index: update index read to consider index.sparse config\n - test-read-cache.c: prepare_repo_settings after config init\n\n Ensure that the sparseness of the in-core index matches the\n index.sparse configuration specified by the repository immediately\n after the on-disk index file is read.\n\n Under discussion.\n\n\n* jc/fix-ref-sorting-parse (2021-10-18) 1 commit\n - for-each-ref: delay parsing of --sort=<atom> options\n\n Things like \"git -c branch.sort=bogus branch new HEAD\", i.e. the\n operation modes of the \"git branch\" command that do not need the\n sort key information, no longer errors out by seeing a bogus sort\n key.\n\n Will merge to 'next'?\n\n\n* jc/tutorial-format-patch-base (2021-10-18) 1 commit\n - MyFirstContribution: teach to use \"format-patch --base=auto\"\n\n Teach and encourage first-time contributors to this project to\n state the base commit when they submit their topic.\n\n\n* jk/http-push-status-fix (2021-10-18) 2 commits\n - transport-helper: recognize \"expecting report\" error from send-pack\n - send-pack: complain about \"expecting report\" with --helper-status\n\n \"git push\" client talking to an HTTP server did not diagnose the\n lack of the final status report from the other side correctly,\n which has been corrected.\n\n Will merge to 'next'.\n\n\n* js/branch-track-inherit (2021-10-18) 1 commit\n - branch: add flags and config to inherit tracking\n\n \"git -c branch.autosetupmerge=inherit branch new old\" makes \"new\"\n to have the same upstream as the \"old\" branch, instead of marking\n \"old\" itself as its upstream.\n\n Under discussion.\n cf. <87a6j6tbsv.fsf@gmgdl.gmail.com>\n\n--------------------------------------------------\n[Stalled]\n\n* ar/submodule-update (2021-10-13) 9 commits\n . submodule--helper: rename helper functions\n . submodule--helper: remove unused helpers\n . submodule: move core cmd_update() logic to C\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: rename helpers for update-clone\n . submodule--helper: get remote names from any repository\n . submodule--helper: split up ensure_core_worktree()\n\n Rewrite of \"git submodule update\" in C.\n\n Kicked out of 'seen' to make room for es/superproject-aware-submodules\n which is among the topics this topic stomps on.\n\n\n* pw/diff-color-moved-fix (2021-08-05) 13 commits\n - diff: drop unused options parameter from cmp_in_block_with_wsd()\n - diff --color-moved: intern strings\n - diff: use designated initializers for emitted_diff_symbol\n - diff --color-moved-ws=allow-indentation-change: improve hash lookups\n - diff --color-moved: stop clearing potential moved blocks\n - diff --color-moved: shrink potential moved blocks as we go\n - diff --color-moved: unify moved block growth functions\n - diff --color-moved: call comparison function directly\n - diff --color-moved-ws=allow-indentation-change: simplify and optimize\n - diff: simplify allow-indentation-change delta calculation\n - diff --color-moved: avoid false short line matches and bad zerba coloring\n - diff --color-moved=zebra: fix alternate coloring\n - diff --color-moved: add perf tests\n\n Originally merged to 'next' on 2021-08-05\n\n Long-overdue correctness and performance update to \"diff\n --color-moved\" feature.\n\n Expecting a reroll.\n cf. <8bec1a6d-5052-50c3-4100-e6348289d581@gmail.com>\n\n\n* cf/fetch-set-upstream-while-detached (2021-07-06) 1 commit\n - fetch: fix segfault on --set-upstream while on a detached HEAD\n\n \"git fetch --set-upstream\" while on detached HEAD segfaulted\n instead of noticing that such an operation did not make sense.\n\n Expecting a reroll.\n cf. <xmqqsg0ri5mq.fsf@gitster.g>\n\n--------------------------------------------------\n[Cooking]\n\n* ab/test-cleanly-recreate-trash-directory (2021-10-15) 1 commit\n  (merged to 'next' on 2021-10-18 at 6fdb43973b)\n + test-lib.sh: try to re-chmod & retry on failed trash removal\n\n Improve test framework around unwritable directories.\n\n Will merge to 'master'.\n\n\n* da/mergetools-special-case-xxdiff-exit-128 (2021-10-13) 1 commit\n  (merged to 'next' on 2021-10-18 at 0dd8a08c63)\n + mergetools/xxdiff: prevent segfaults from stopping difftool\n\n The xxdiff difftool backend can exit with status 128, which the\n difftool-helper that launches the backend takes as a significant\n failure, when it is not significant at all.  Work it around.\n\n Will merge to 'master'.\n\n\n* fs/ssh-signing-fix (2021-10-18) 5 commits\n  (merged to 'next' on 2021-10-18 at 5ffa706433)\n + gpg-interface: fix leak of strbufs in get_ssh_key_fingerprint()\n + gpg-interface: fix leak of \"line\" in parse_ssh_output()\n  (merged to 'next' on 2021-10-14 at 97735c6091)\n + ssh signing: clarify trustlevel usage in docs\n + ssh signing: fmt-merge-msg tests & config parse\n + Merge branch 'fs/ssh-signing' into fs/ssh-signing-fix\n (this branch uses fs/ssh-signing.)\n\n Fix-up for the other topic already in 'next'.\n\n Will merge to 'master'.\n\n\n* jc/doc-commit-header-continuation-line (2021-10-12) 1 commit\n  (merged to 'next' on 2021-10-18 at 99b71c0aaf)\n + signature-format.txt: explain and illustrate multi-line headers\n\n Doc update.\n\n Will merge to 'master'.\n cf. <87sfx1hnp4.fsf@trouble.defaultvalue.org>\n\n\n* rb/doc-commit-header-continuation-line (2021-10-11) 1 commit\n - signature-format.txt: add space to fix gpgsig continuation line\n\n Values in the header portion of commit object can be multi-lined\n by a single SP indentation of the second and subsequent lines, and\n this applies to an empty line as well.  Update an example in the\n technical documentation to highlight it.\n\n Will discard.\n\n Superseded by the jc/doc-commit-header-continuation-line topic.\n\n\n* jh/builtin-fsmonitor-part2 (2021-10-14) 5 commits\n - fsmonitor: update fsmonitor config documentation\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 Breaks check-docs lint.\n\n\n* ld/sparse-diff-blame (2021-10-15) 3 commits\n - blame: enable and test the sparse index\n - diff: enable and test the sparse index\n - Merge branch 'vd/sparse-reset' into ld/sparse-diff-blame\n (this branch uses vd/sparse-reset.)\n\n Teach diff and blame to work well with sparse index.\n\n\n* ab/mark-leak-free-tests (2021-10-12) 10 commits\n  (merged to 'next' on 2021-10-18 at c522807d5d)\n + leak tests: mark some misc tests as passing with SANITIZE=leak\n + leak tests: mark various \"generic\" tests as passing with SANITIZE=leak\n + leak tests: mark some read-tree tests as passing with SANITIZE=leak\n + leak tests: mark some ls-files tests as passing with SANITIZE=leak\n + leak tests: mark all checkout-index tests as passing with SANITIZE=leak\n + leak tests: mark all trace2 tests as passing with SANITIZE=leak\n + leak tests: mark all ls-tree tests as passing with SANITIZE=leak\n + leak tests: run various \"test-tool\" tests in t00*.sh SANITIZE=leak\n + leak tests: run various built-in tests in t00*.sh SANITIZE=leak\n + Merge branch 'ab/sanitize-leak-ci' into ab/mark-leak-free-tests\n\n Bunch of tests are marked as \"passing leak check\".\n\n Will merge to 'master'.\n\n\n* ab/mark-leak-free-tests-more (2021-10-07) 8 commits\n  (merged to 'next' on 2021-10-18 at fe798f77b8)\n + merge: add missing strbuf_release()\n + ls-files: add missing string_list_clear()\n + ls-files: fix a trivial dir_clear() leak\n + tests: fix test-oid-array leak, test in SANITIZE=leak\n + tests: fix a memory leak in test-oidtree.c\n + tests: fix a memory leak in test-parse-options.c\n + tests: fix a memory leak in test-prio-queue.c\n + Merge branch 'ab/sanitize-leak-ci' into ab/mark-leak-free-tests-more\n\n Bunch of tests are marked as \"passing leak check\".\n\n Will merge to 'master'.\n\n\n* ab/unpack-trees-leakfix (2021-10-13) 4 commits\n  (merged to 'next' on 2021-10-14 at bb54827704)\n + sequencer: fix a memory leak in do_reset()\n + sequencer: add a \"goto cleanup\" to do_reset()\n + unpack-trees: don't leak memory in verify_clean_subdirectory()\n + Merge branch 'ab/sanitize-leak-ci' into ab/unpack-trees-leakfix\n\n Leakfix.\n\n Will merge to 'master'.\n\n\n* js/userdiff-cpp (2021-10-10) 6 commits\n  (merged to 'next' on 2021-10-18 at fea77f6c4e)\n + userdiff-cpp: learn the C++ spaceship operator\n + userdiff-cpp: permit the digit-separating single-quote in numbers\n + userdiff-cpp: prepare test cases with yet unsupported features\n + userdiff-cpp: tighten word regex\n + t4034: add tests showing problematic cpp tokenizations\n + t4034/cpp: actually test that operator tokens are not split\n\n Userdiff patterns for the C++ language has been updated.\n\n Will merge to 'master'.\n\n\n* mp/absorb-submodule-git-dir-upon-deinit (2021-10-07) 1 commit\n - submodule: absorb git dir instead of dying on deinit\n\n \"git submodule deinit\" for a submodule whose .git metadata\n directory is embedded in its working tree refused to work, until\n the submodule gets converted to use the \"absorbed\" form where the\n metadata directory is stored in superproject, and a gitfile at the\n top-level of the working tree of the submodule points at it.  The\n command is taught to convert such submodules to the absorbed form\n as needed.\n\n Under review.\n cf. <xmqqwnmopqqk.fsf@gitster.g>\n\n\n* ns/remerge-diff (2021-10-08) 8 commits\n - doc/diff-options: explain the new --remerge-diff option\n - show, log: adapt Elijah Newren's changes to common tmp-objdir API\n - show, log: provide a --remerge-diff capability\n - merge-ort: capture and print ll-merge warnings in our preferred fashion\n - ll-merge: add API for capturing warnings in a strbuf instead of stderr\n - merge-ort: add ability to record conflict messages in a file\n - merge-ort: mark a few more conflict messages as omittable\n - Merge branch 'ns/tmp-objdir' into ns/remerge-diff\n (this branch uses ns/tmp-objdir.)\n\n A new presentation for two-parent merge \"--remerge-diff\" can be\n used to show the difference between mechanical (and possibly\n conflicted) merge results and the recorded resolution.\n\n On hold.\n This is Elijah's remerge-diff rebased on ns/tmp-objdir to share the\n \"create objects temporarily, only to discard without committing\n them to longer-term storage\" infrastructure with another topic.\n\n\n* ns/tmp-objdir (2021-10-04) 2 commits\n - tmp-objdir: disable ref updates when replacing the primary odb\n - tmp-objdir: new API for creating temporary writable databases\n (this branch is used by ns/batched-fsync and ns/remerge-diff.)\n\n New interface into the tmp-objdir API to help in-core use of the\n quarantine feature.\n\n Will merge to 'next'.\n\n\n* pw/sparse-cache-tree-verify-fix (2021-10-18) 2 commits\n  (merged to 'next' on 2021-10-18 at 0186a643cc)\n + t1092: run \"rebase --apply\" without \"-q\" in testing\n  (merged to 'next' on 2021-10-11 at 2f90c87850)\n + sparse index: fix use-after-free bug in cache_tree_verify()\n\n Recent sparse-index addition, namely any use of index_name_pos(),\n can expand sparse index entries and breaks any code that walks\n cache-tree or existing index entries.  One such instance of such a\n breakage has been corrected.\n\n Will merge to 'master'.\n\n\n* vd/sparse-reset (2021-10-11) 8 commits\n - unpack-trees: improve performance of next_cache_entry\n - reset: make --mixed sparse-aware\n - reset: make sparse-aware (except --mixed)\n - reset: integrate with sparse index\n - reset: expand test coverage for sparse checkouts\n - sparse-index: update command for expand/collapse test\n - reset: preserve skip-worktree bit in mixed reset\n - reset: rename is_missing to !is_in_reset_tree\n (this branch is used by ld/sparse-diff-blame.)\n\n Various operating modes of \"git reset\" have been made to work\n better with the sparse index.\n\n Needs review.\n\n\n* gc/use-repo-settings (2021-10-15) 4 commits\n - gc: perform incremental repack when implictly enabled\n - fsck: verify multi-pack-index when implictly enabled\n - fsck: verify commit graph when implicitly enabled\n - Merge branch 'ab/ignore-replace-while-working-on-commit-graph' into gc/use-repo-settings\n (this branch uses ab/ignore-replace-while-working-on-commit-graph.)\n\n It is wrong to read some settings directly from the config\n subsystem, as things like feature.experimental can affect their\n default values.\n\n Will merge to 'next'?\n\n\n* jh/perf-remove-test-times (2021-10-04) 1 commit\n  (merged to 'next' on 2021-10-14 at 473a26166c)\n + t/perf/perf-lib.sh: remove test_times.* at the end test_perf_()\n\n Perf test fix.\n\n Will merge to 'master'.\n\n\n* pw/fix-some-issues-in-reset-head (2021-10-01) 12 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 - reset_head(): make default_reflog_action optional\n - reset_head(): factor out ref updates\n - reset_head(): remove action parameter\n - reset_head(): don't run checkout hook if there is an error\n - reset_head(): fix checkout\n - rebase: factor out checkout for up to date branch\n - Merge branch 'pw/rebase-of-a-tag-fix' into pw/fix-some-issues-in-reset-head\n\n Fix \"some issues\" in a helper function reset_head().\n\n Expecting a reroll.\n Needs a lot better explanation, including what the issues are,\n which codepaths the helper is used and to do what, and tests to\n protect the fixes.\n\n\n* ab/parse-options-cleanup (2021-10-08) 10 commits\n  (merged to 'next' on 2021-10-18 at 305d339ad9)\n + parse-options: change OPT_{SHORT,UNSET} to an enum\n + parse-options tests: test optname() output\n + parse-options.[ch]: make opt{bug,name}() \"static\"\n + commit-graph: stop using optname()\n + parse-options.c: move optname() earlier in the file\n + parse-options.h: make the \"flags\" in \"struct option\" an enum\n + parse-options.c: use exhaustive \"case\" arms for \"enum parse_opt_result\"\n + parse-options.[ch]: consistently use \"enum parse_opt_result\"\n + parse-options.[ch]: consistently use \"enum parse_opt_flags\"\n + parse-options.h: move PARSE_OPT_SHELL_EVAL between enums\n\n Random changes to parse-options implementation.\n\n Will merge to 'master'.\n\n\n* es/superproject-aware-submodules (2021-10-14) 4 commits\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 Will merge to 'next'?\n\n\n* ab/fsck-unexpected-type (2021-10-01) 17 commits\n  (merged to 'next' on 2021-10-14 at 10edc78c9c)\n + fsck: report invalid object type-path combinations\n + fsck: don't hard die on invalid object types\n + object-file.c: stop dying in parse_loose_header()\n + object-file.c: return ULHR_TOO_LONG on \"header too long\"\n + object-file.c: use \"enum\" return type for unpack_loose_header()\n + object-file.c: simplify unpack_loose_short_header()\n + object-file.c: make parse_loose_header_extended() public\n + object-file.c: return -1, not \"status\" from unpack_loose_header()\n + object-file.c: don't set \"typep\" when returning non-zero\n + cat-file tests: test for current --allow-unknown-type behavior\n + cat-file tests: add corrupt loose object test\n + cat-file tests: test for missing/bogus object with -t, -s and -p\n + cat-file tests: move bogus_* variable declarations earlier\n + fsck tests: test for garbage appended to a loose object\n + fsck tests: test current hash/type mismatch behavior\n + fsck tests: refactor one test to use a sub-repo\n + fsck tests: add test for fsck-ing an unknown type\n\n \"git fsck\" has been taught to report mismatch between expected and\n actual types of an object better.\n\n Will merge to 'master'.\n\n\n* jt/no-abuse-alternate-odb-for-submodules (2021-10-08) 9 commits\n  (merged to 'next' on 2021-10-14 at ae49a2ceda)\n + submodule: trace adding submodule ODB as alternate\n + submodule: pass repo to check_has_commit()\n + object-file: only register submodule ODB if needed\n + merge-{ort,recursive}: remove add_submodule_odb()\n + refs: peeling non-the_repository iterators is BUG\n + refs: teach arbitrary repo support to iterators\n + refs: plumb repo into ref stores\n + Merge branch 'jk/ref-paranoia' into jt/no-abuse-alternate-odb-for-submodules\n + Merge branch 'jt/add-submodule-odb-clean-up' into jt/no-abuse-alternate-odb-for-submodules\n\n Follow through the work to use the repo interface to access\n submodule objects in-process, instead of abusing the alternate\n object database interface.\n\n Will merge to 'master'.\n\n\n* tp/send-email-completion (2021-10-07) 3 commits\n - send-email docs: add format-patch options\n - send-email: programmatically generate bash completions\n - send-email: terminate --git-completion-helper with LF\n\n The command line complation for \"git send-email\" options have been\n tweaked to make it easier to keep it in sync with the command itself.\n\n Expecting a reroll.\n cf. <87fst7lkjx.fsf@evledraar.gmail.com>\n\n\n* hm/paint-hits-in-log-grep (2021-10-15) 4 commits\n - grep/pcre2: fix an edge case concerning ascii patterns and UTF-8 data\n - pretty: colorize pattern matches in commit messages\n - grep: refactor next_match() and match_one_pattern() for external use\n - Merge branch 'jk/grep-haystack-is-read-only' into hm/paint-hits-in-log-grep\n\n \"git log --grep=string --author=name\" learns to highlight hits just\n like \"git grep string\" does.\n\n Will merge to 'next'?\n cf. <xmqq1r4vjji3.fsf@gitster.g>\n\n\n* ks/submodule-add-message-fix (2021-09-20) 1 commit\n - submodule--helper: fix incorrect newlines in an error message\n\n Message regression fix.\n\n Waiting for a response.\n cf. <m27df9lvm1.fsf@gmail.com>\n\n\n* ns/batched-fsync (2021-10-08) 8 commits\n - core.fsyncobjectfiles: performance tests for add and stash\n - core.fsyncobjectfiles: tests for batch mode\n - unpack-objects: use the bulk-checkin infrastructure\n - update-index: use the bulk-checkin infrastructure\n - core.fsyncobjectfiles: add windows support for batch mode\n - core.fsyncobjectfiles: batched disk flushes\n - bulk-checkin: rename 'state' variable and separate 'plugged' boolean\n - Merge branch 'ns/tmp-objdir' into ns/batched-fsync\n (this branch uses ns/tmp-objdir.)\n\n The \"core.fsyncobjectfiles\" configuration variable can now be set\n to \"batch\" for improved performance.\n\n Will merge to 'next'?\n\n\n* en/zdiff3 (2021-09-20) 2 commits\n - update documentation for new zdiff3 conflictStyle\n - xdiff: implement a zealous diff3, or \"zdiff3\"\n\n \"Zealous diff3\" style of merge conflict presentation has been added.\n\n\n* js/scalar (2021-10-07) 15 commits\n - scalar: accept -C and -c options before the subcommand\n - scalar: implement the `version` command\n - scalar: implement the `delete` command\n - scalar: teach 'reconfigure' to optionally handle all registered enlistments\n - scalar: allow reconfiguring an existing enlistment\n - scalar: implement the `run` command\n - scalar: teach 'clone' to support the --single-branch option\n - scalar: implement the `clone` subcommand\n - scalar: implement 'scalar list'\n - scalar: let 'unregister' handle a deleted enlistment directory gracefully\n - scalar: 'unregister' stops background maintenance\n - scalar: 'register' sets recommended config and starts maintenance\n - scalar: create test infrastructure\n - scalar: start documenting the command\n - scalar: create a rudimentary executable\n\n Add pieces from \"scalar\" to contrib/.\n\n What's the status of this thing?\n\n\n* ms/customizable-ident-expansion (2021-09-01) 1 commit\n - keyword expansion: make \"$Id$\" string configurable\n\n Instead of \"$Id$\", user-specified string (like $FreeBSD$) can be\n used as an in-blob placeholder for keyword expansion.\n\n What's the status of this one?  Meh?\n\n\n* ab/refs-errno-cleanup (2021-10-16) 21 commits\n - refs API: post-migration API renaming [2/2]\n - refs API: post-migration API renaming [1/2]\n - refs API: don't expose \"errno\" in run_transaction_hook()\n - refs API: make expand_ref() & repo_dwim_log() not set errno\n - refs API: make resolve_ref_unsafe() not set errno\n - refs API: make refs_ref_exists() not set errno\n - refs API: make refs_resolve_refdup() not set errno\n - refs tests: ignore ignore errno in test-ref-store helper\n - refs API: ignore errno in worktree.c's find_shared_symref()\n - refs API: ignore errno in worktree.c's add_head_info()\n - refs API: make files_copy_or_rename_ref() et al not set errno\n - refs API: make loose_fill_ref_dir() not set errno\n - refs API: make resolve_gitlink_ref() not set errno\n - refs API: remove refs_read_ref_full() wrapper\n - refs/files: remove \"name exist?\" check in lock_ref_oid_basic()\n - reflog tests: add --updateref tests\n - refs API: make refs_rename_ref_available() static\n - refs API: make parse_loose_ref_contents() not set errno\n - refs API: make refs_read_raw_ref() not set errno\n - refs API: add a version of refs_resolve_ref_unsafe() with \"errno\"\n - branch tests: test for errno propagating on failing read\n\n The \"remainder\" of hn/refs-errno-cleanup topic.\n\n Will merge to 'next'?\n\n\n* ab/only-single-progress-at-once (2021-10-13) 10 commits\n - progress.c: add & assert a \"global_progress\" variable\n - various *.c: use isatty(1|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: call progress_interval() from progress_test_force_update()\n - progress.c: move signal handler functions lower\n - progress.c tests: test some invalid usage\n - progress.c tests: make start/stop verbs on stdin\n - progress.c test helper: add missing braces\n - leak tests: fix a memory leaks in \"test-progress\" helper\n\n Further tweaks on progress API.\n\n Will merge to 'next'?\n\n\n* fs/ssh-signing (2021-09-10) 9 commits\n  (merged to 'next' on 2021-10-11 at b456b95672)\n + ssh signing: test that gpg fails for unknown keys\n + ssh signing: tests for logs, tags & push certs\n + ssh signing: duplicate t7510 tests for commits\n + ssh signing: verify signatures using ssh-keygen\n + ssh signing: provide a textual signing_key_id\n + ssh signing: retrieve a default key from ssh-agent\n + ssh signing: add ssh key format and signing code\n + ssh signing: add test prereqs\n + ssh signing: preliminary refactoring and clean-up\n (this branch is used by fs/ssh-signing-fix.)\n\n Use ssh public crypto for object and push-cert signing.\n\n Will merge to 'master'.\n\n\n* hn/reftable (2021-10-08) 19 commits\n - Add \"test-tool dump-reftable\" command.\n - reftable: add dump utility\n - reftable: implement stack, a mutable database of reftable files.\n - reftable: implement refname validation\n - reftable: add merged table view\n - reftable: add a heap-based priority queue for reftable records\n - reftable: reftable file level tests\n - reftable: read reftable files\n - reftable: generic interface to tables\n - reftable: write reftable files\n - reftable: a generic binary tree implementation\n - reftable: reading/writing blocks\n - Provide zlib's uncompress2 from compat/zlib-compat.c\n - reftable: (de)serialization for the polymorphic record type.\n - reftable: add blocksource, an abstraction for random access reads\n - reftable: utility functions\n - reftable: add error related functionality\n - reftable: add LICENSE\n - hash.h: provide constants for the hash IDs\n\n The \"reftable\" backend for the refs API, without integrating into\n the refs subsystem.\n\n--------------------------------------------------\n[Discarded]\n\n* en/remerge-diff (2021-08-31) 7 commits\n . doc/diff-options: explain the new --remerge-diff option\n . show, log: provide a --remerge-diff capability\n . tmp-objdir: new API for creating and removing primary object dirs\n . merge-ort: capture and print ll-merge warnings in our preferred fashion\n . ll-merge: add API for capturing warnings in a strbuf instead of stderr\n . merge-ort: add ability to record conflict messages in a file\n . merge-ort: mark a few more conflict messages as omittable\n\n A new presentation for two-parent merge \"--remerge-diff\" can be\n used to show the difference between mechanical (and possibly\n conflicted) merge results and the recorded resolution.\n"},{"id":"439034","messageId":"nycvar.QRO.7.76.6.2110191436250.56@tvgsbejvaqbjf.bet","threadId":"56737","inReplyTo":"xmqq1r4hv7bv.fsf@gitster.g","subject":"js/scalar, was Re: What's cooking in git.git (Oct 2021, #05; Mon, 18)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2021-10-19T12:45:07Z","receivedAt":"2021-10-19T12:45:14Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Mon, 18 Oct 2021, Junio C Hamano wrote:\n\n> * js/scalar (2021-10-07) 15 commits\n>  - scalar: accept -C and -c options before the subcommand\n>  - scalar: implement the `version` command\n>  - scalar: implement the `delete` command\n>  - scalar: teach 'reconfigure' to optionally handle all registered enlistments\n>  - scalar: allow reconfiguring an existing enlistment\n>  - scalar: implement the `run` command\n>  - scalar: teach 'clone' to support the --single-branch option\n>  - scalar: implement the `clone` subcommand\n>  - scalar: implement 'scalar list'\n>  - scalar: let 'unregister' handle a deleted enlistment directory gracefully\n>  - scalar: 'unregister' stops background maintenance\n>  - scalar: 'register' sets recommended config and starts maintenance\n>  - scalar: create test infrastructure\n>  - scalar: start documenting the command\n>  - scalar: create a rudimentary executable\n>\n>  Add pieces from \"scalar\" to contrib/.\n>\n>  What's the status of this thing?\n\nAs far as I am concerned, the current status is: We agreed that this thing\n_can_ live in contrib/, and that the `scalar` command itself should not be\nintegrated deeply into Git because the end game is for `git clone` (and\nmaybe `git maintenance`) to learn Scalar's tricks.\n\nA concern was raised that `make -C contrib/scalar` does not rebuild\n`libgit.a` whenever any of `libgit.a`'s source files were modified. In\nlight of the previous paragraph, I believe that my time would be better\nspent on designing a new `git clone` option, though, than to spend time on\na build process that will be soon obsolete (except if I allow myself to be\ndistracted by things like teaching `make -C contrib/scalar` to know about\n`libgit.a`'s prerequisites). In other words, it is a technical debt I\nfirmly believe is worth accruing.\n\nOther than that, I heard no objections, therefore I believe that this is\nready for `next`, to be cooked in the v2.34 cycle.\n\nCiao,\nDscho\n"},{"id":"439040","messageId":"55716d3f-a0e6-a047-49f1-bf2be8ba2b72@kdbg.org","threadId":"56737","inReplyTo":"xmqq1r4hv7bv.fsf@gitster.g","subject":"Re: What's cooking in git.git (Oct 2021, #05; Mon, 18)","fromName":"Johannes Sixt","fromEmail":"j6t@kdbg.org","sentAt":"2021-10-19T19:33:29Z","receivedAt":"2021-10-19T19:33:36Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Am 19.10.21 um 08:48 schrieb Junio C Hamano:\n> * js/userdiff-cpp (2021-10-10) 6 commits\n>   (merged to 'next' on 2021-10-18 at fea77f6c4e)\n>  + userdiff-cpp: learn the C++ spaceship operator\n>  + userdiff-cpp: permit the digit-separating single-quote in numbers\n>  + userdiff-cpp: prepare test cases with yet unsupported features\n>  + userdiff-cpp: tighten word regex\n>  + t4034: add tests showing problematic cpp tokenizations\n>  + t4034/cpp: actually test that operator tokens are not split\n> \n>  Userdiff patterns for the C++ language has been updated.\n> \n>  Will merge to 'master'.\n\nPlease don't, yet. There is a regression that, e.g., 2' as in '2' is\nregarded as a token.\n\nWill submit a fix (the plan is to undo the digit separator thing), but\nit'll take a week or two as I am currently knocked out.\n\n-- Hannes\n"},{"id":"439054","messageId":"kl6l8ryomxyq.fsf@chooglen-macbookpro.roam.corp.google.com","threadId":"56737","inReplyTo":"xmqq1r4hv7bv.fsf@gitster.g","subject":"Re: What's cooking in git.git (Oct 2021, #05; Mon, 18)","fromName":"Glen Choo","fromEmail":"chooglen@google.com","sentAt":"2021-10-19T22:49:49Z","receivedAt":"2021-10-19T22:49:53Z","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/remote-with-fewer-static-global-variables (2021-10-13) 3 commits\n>  - remote: add struct repository parameter to external functions\n>  - remote: use remote_state parameter internally\n>  - remote: move static variables into per-repository struct\n> \n>  Code clean-up to eventually allow information on remotes defined\n>  for an arbitrary repository to be read.\n> \n>  Will merge to 'next'?\n\nI've just sent out a v3 that incorporates a lot of your feedback on v2\nand fixes a dumb bug due to a static variable slipped through the cracks\nas I was iterating.\n\nhttps://lore.kernel.org/git/20211019224339.61881-1-chooglen@google.com.\n"},{"id":"439086","messageId":"211020.86czo0ncxa.gmgdl@evledraar.gmail.com","threadId":"56737","inReplyTo":"xmqq1r4hv7bv.fsf@gitster.g","subject":"ab/config-based-hooks-2","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2021-10-20T11:37:49Z","receivedAt":"2021-10-20T11:39:04Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Mon, Oct 18 2021, Junio C Hamano wrote:\n\n> * ab/config-based-hooks-2 (2021-10-15) 14 commits\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>  - merge: convert post-merge to use hook.h\n>  - hooks: convert 'post-checkout' hook to hook library\n>  - am: convert applypatch to use hook.h\n>  - rebase: convert pre-rebase to use hook.h\n>  - gc: use hook library for pre-auto-gc hook\n>  - hook: add 'run' subcommand\n>  - Merge branch 'ab/config-based-hooks-1' into ab/config-based-hooks-2\n>\n>  More \"config-based hooks\".\n>\n>  Breaks t2400.\n\nRe-rolled with a fix for that per\nhttps://lore.kernel.org/git/cover-v3-00.13-00000000000-20211019T231647Z-avarab@gmail.com/;\nsorry about the breakage.\n\n"},{"id":"439104","messageId":"211020.86zgr3n698.gmgdl@evledraar.gmail.com","threadId":"56737","inReplyTo":"nycvar.QRO.7.76.6.2110191436250.56@tvgsbejvaqbjf.bet","subject":"Re: js/scalar, was Re: What's cooking in git.git (Oct 2021, #05; Mon, 18)","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2021-10-20T13:42:20Z","receivedAt":"2021-10-20T14:05:23Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Tue, Oct 19 2021, Johannes Schindelin wrote:\n\n> On Mon, 18 Oct 2021, Junio C Hamano wrote:\n>\n>> * js/scalar (2021-10-07) 15 commits\n>>  - scalar: accept -C and -c options before the subcommand\n>>  - scalar: implement the `version` command\n>>  - scalar: implement the `delete` command\n>>  - scalar: teach 'reconfigure' to optionally handle all registered enlistments\n>>  - scalar: allow reconfiguring an existing enlistment\n>>  - scalar: implement the `run` command\n>>  - scalar: teach 'clone' to support the --single-branch option\n>>  - scalar: implement the `clone` subcommand\n>>  - scalar: implement 'scalar list'\n>>  - scalar: let 'unregister' handle a deleted enlistment directory gracefully\n>>  - scalar: 'unregister' stops background maintenance\n>>  - scalar: 'register' sets recommended config and starts maintenance\n>>  - scalar: create test infrastructure\n>>  - scalar: start documenting the command\n>>  - scalar: create a rudimentary executable\n>>\n>>  Add pieces from \"scalar\" to contrib/.\n>>\n>>  What's the status of this thing?\n>\n> As far as I am concerned, the current status is: We agreed that this thing\n> _can_ live in contrib/, and that the `scalar` command itself should not be\n> integrated deeply into Git because the end game is for `git clone` (and\n> maybe `git maintenance`) to learn Scalar's tricks.\n>\n> A concern was raised that `make -C contrib/scalar` does not rebuild\n> `libgit.a` whenever any of `libgit.a`'s source files were modified. In\n> light of the previous paragraph, I believe that my time would be better\n> spent on designing a new `git clone` option, though, than to spend time on\n> a build process that will be soon obsolete (except if I allow myself to be\n> distracted by things like teaching `make -C contrib/scalar` to know about\n> `libgit.a`'s prerequisites). In other words, it is a technical debt I\n> firmly believe is worth accruing.\n>\n> Other than that, I heard no objections, therefore I believe that this is\n> ready for `next`, to be cooked in the v2.34 cycle.\n\nYour patches as they stand don't implement a \"make install{-doc,-man}\"\nfor the new command. I have a WIP patch on top to make that and various\nother things that are broken about it work as summarized in[1].\n\nI'm happy to help you make that work, but I don't think framing it as\nsome abstract objection about whether something lives in contrib or not\nis accurate.\n\nI'v said that I don't care how things live in-tree in the abstract, but\nas a practical matter much of our build process is entangled with what\nlives at which paths. That issue with having an incomplete libgit.a\ndependency graph is just the tip of the iceberg.\n\nFor example in your just-sent[2] you say:\n\n    I would like to add a plug for Scalar here. Maybe we can link to this\n    \"opinionated tool based on Git\" here? I wouldn't ask if I didn't _know_\n    that it helps monorepo users out there.\n\nI agree that would be useful, but currently our documentation build\nwould fail if you linked to the scalar from other git documentation.\nSince we lint it and check if the linkgit:* crosslinks would be 404'd.\n\nThat's aside from the issue of there being no installation targets in\nyour version of the Makefile integration, so even if you get that past\nthe \"lint\" the installed docs wouldn't have a scalar documentation\ninstalled on the system.\n\nOf course all of those issue are fixable if your version of the patches\nwere to land, as are other issues like your new *.c file implicitly not\nbeing covered by the coccicheck target.\n\nI don't see why wouldn't consider an up-front solution to that technical\ndebt, or why you're seemingly ignoring comments about aspects of your\npatches that are broken or will cause that unnecessary technical debt.\n\nIt would be a hassle to deal with when it comes to various build-system\nintegration we already have, or which I have WIP work to implement. I'm\nalso offering to fix it for you, so it wouldn't be much of a distraction\nto your efforts.\n\n1. https://lore.kernel.org/git/87fstdgh8m.fsf@evledraar.gmail.com/\n2. https://lore.kernel.org/git/nycvar.QRO.7.76.6.2110201349570.56@tvgsbejvaqbjf.bet/\n"},{"id":"439180","messageId":"nycvar.QRO.7.76.6.2110210947590.56@tvgsbejvaqbjf.bet","threadId":"56737","inReplyTo":"211020.86zgr3n698.gmgdl@evledraar.gmail.com","subject":"Re: js/scalar, was Re: What's cooking in git.git (Oct 2021, #05; Mon, 18)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2021-10-21T08:33:40Z","receivedAt":"2021-10-21T08:33:47Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Ævar,\n\ntl;dr it isn't worth your nor my time for you to focus on the build\nprocess in contrib/scalar/ at this moment.\n\nHaving said that, I do appreciate your interest in this patch series, and\nI have suggestions at the end of this mail how we could collaborate on it\nin a more fruitful manner.\n\nOn Wed, 20 Oct 2021, Ævar Arnfjörð Bjarmason wrote:\n\n> On Tue, Oct 19 2021, Johannes Schindelin wrote:\n>\n> > On Mon, 18 Oct 2021, Junio C Hamano wrote:\n> >\n> >> * js/scalar (2021-10-07) 15 commits\n> >>  - scalar: accept -C and -c options before the subcommand\n> >>  - scalar: implement the `version` command\n> >>  - scalar: implement the `delete` command\n> >>  - scalar: teach 'reconfigure' to optionally handle all registered enlistments\n> >>  - scalar: allow reconfiguring an existing enlistment\n> >>  - scalar: implement the `run` command\n> >>  - scalar: teach 'clone' to support the --single-branch option\n> >>  - scalar: implement the `clone` subcommand\n> >>  - scalar: implement 'scalar list'\n> >>  - scalar: let 'unregister' handle a deleted enlistment directory gracefully\n> >>  - scalar: 'unregister' stops background maintenance\n> >>  - scalar: 'register' sets recommended config and starts maintenance\n> >>  - scalar: create test infrastructure\n> >>  - scalar: start documenting the command\n> >>  - scalar: create a rudimentary executable\n> >>\n> >>  Add pieces from \"scalar\" to contrib/.\n> >>\n> >>  What's the status of this thing?\n> >\n> > As far as I am concerned, the current status is: We agreed that this\n> > thing _can_ live in contrib/, and that the `scalar` command itself\n> > should not be integrated deeply into Git because the end game is for\n> > `git clone` (and maybe `git maintenance`) to learn Scalar's tricks.\n> >\n> > A concern was raised that `make -C contrib/scalar` does not rebuild\n> > `libgit.a` whenever any of `libgit.a`'s source files were modified. In\n> > light of the previous paragraph, I believe that my time would be\n> > better spent on designing a new `git clone` option, though, than to\n> > spend time on a build process that will be soon obsolete (except if I\n> > allow myself to be distracted by things like teaching `make -C\n> > contrib/scalar` to know about `libgit.a`'s prerequisites). In other\n> > words, it is a technical debt I firmly believe is worth accruing.\n> >\n> > Other than that, I heard no objections, therefore I believe that this\n> > is ready for `next`, to be cooked in the v2.34 cycle.\n>\n> Your patches as they stand don't implement a \"make install{-doc,-man}\"\n> for the new command.\n\nRight. They are just a start.\n\nI would like to direct your attention to\nhttps://github.com/microsoft/git/compare/vfs-2.33.0...dscho:vfs-with-scalar,\nwhich has a more complete picture of what I have.\n\nIt is a thicket of 8 patch series. I would like to hold your horses until\nit is time for me to submit `include-scalar-in-build`, in particular\nhttps://github.com/dscho/git/commit/473ca8ae673.\n\n> I'm happy to help you make that work, but I don't think framing it as\n> some abstract objection about whether something lives in contrib or not\n> is accurate.\n\nScalar is headed to contrib/ _specifically_ to make it clear that it is\n_not_ a core part of Git. I laid out the reasons before: the user\ninterface of the Scalar executable is already in use, and hence\nnon-negotiable.\n\nSince it won't be part of core Git, I fail to see the urgency to integrate\nits build process more closely into Git's build process, _right now_.\n\n> For example in your just-sent[2] you say:\n>\n>     I would like to add a plug for Scalar here. Maybe we can link to this\n>     \"opinionated tool based on Git\" here? I wouldn't ask if I didn't _know_\n>     that it helps monorepo users out there.\n>\n> I agree that would be useful, but currently our documentation build\n> would fail if you linked to the scalar from other git documentation.\n> Since we lint it and check if the linkgit:* crosslinks would be 404'd.\n\nThe link I was implying was\nhttps://github.com/microsoft/git/blob/HEAD/contrib/scalar/docs/index.md.\nSorry for not spelling it out clearly.\n\n> I don't see why wouldn't consider an up-front solution to that technical\n> debt, or why you're seemingly ignoring comments about aspects of your\n> patches that are broken or will cause that unnecessary technical debt.\n\nOne of the many reasons why one might want to accrue technical debt, and\nit is my reason in this context, is the expectation that it won't need to\nbe paid down at all because we will eventually just delete contrib/scalar/\nin a couple of years, when it has served its purpose.\n\n> It would be a hassle to deal with when it comes to various build-system\n> integration we already have, or which I have WIP work to implement. I'm\n> also offering to fix it for you, so it wouldn't be much of a distraction\n> to your efforts.\n\nUnfortunately, it is very much a distraction of my efforts. Not only would\nyour patches force me to spend more time to rework and adapt my patches to\nyour changes, as they _specifically_ touch the same code that I am working\non. It is also forcing me to spend time on reading all your mails, and on\nwriting mails like this one.\n\nI would have much rather spent my energy on the next steps: contributing\nthe `scalar-diagnose` patches, and working towards a new, experimental\n`git clone`/`git init` option that automatically registers the worktree\nwith `git maintenance`, and then using that in `contrib/scalar/`.\n\nIt would be helpful to pick up other feature enhancements, in less related\ncode locations (to avoid stepping on each others' toes all the time), such\nas silencing the warning in `scalar reconfigure -a` when an enlistment was\ndeleted manually, and instead removing it from the `scalar` and the\n`maintenance` sections in `~/.gitconfig`. Or to teach `git maintenance` to\nalready do the equivalent when a scheduled run detects a missing worktree.\n\nCiao,\nDscho\n"},{"id":"439183","messageId":"211021.86a6j2mx1f.gmgdl@evledraar.gmail.com","threadId":"56737","inReplyTo":"xmqq1r4hv7bv.fsf@gitster.g","subject":"ab/only-single-progress-at-once (was: What's cooking in git.git (Oct 2021, #05; Mon, 18))","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2021-10-21T11:32:16Z","receivedAt":"2021-10-21T11:34:25Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Mon, Oct 18 2021, Junio C Hamano wrote:\n\n> * ab/only-single-progress-at-once (2021-10-13) 10 commits\n>  - progress.c: add & assert a \"global_progress\" variable\n>  - various *.c: use isatty(1|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: call progress_interval() from progress_test_force_update()\n>  - progress.c: move signal handler functions lower\n>  - progress.c tests: test some invalid usage\n>  - progress.c tests: make start/stop verbs on stdin\n>  - progress.c test helper: add missing braces\n>  - leak tests: fix a memory leaks in \"test-progress\" helper\n>\n>  Further tweaks on progress API.\n>\n>  Will merge to 'next'?\n\nI think it should be ready & has reviewed quite a bit of review so far.\n\nTaylor lifted one of the patches for his just-submitted topic:\nhttps://lore.kernel.org/git/cover.1634787555.git.me@ttaylorr.com/; just\nan FYI in terms of graduation/merging etc.\n"},{"id":"439371","messageId":"211022.868rylkuw7.gmgdl@evledraar.gmail.com","threadId":"56737","inReplyTo":"nycvar.QRO.7.76.6.2110210947590.56@tvgsbejvaqbjf.bet","subject":"Re: js/scalar, was Re: What's cooking in git.git (Oct 2021, #05; Mon, 18)","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2021-10-22T13:43:31Z","receivedAt":"2021-10-22T14:16:16Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Thu, Oct 21 2021, Johannes Schindelin wrote:\n\n> Hi Ævar,\n>\n> tl;dr it isn't worth your nor my time for you to focus on the build\n> process in contrib/scalar/ at this moment.\n>\n> Having said that, I do appreciate your interest in this patch series, and\n> I have suggestions at the end of this mail how we could collaborate on it\n> in a more fruitful manner.\n>\n> On Wed, 20 Oct 2021, Ævar Arnfjörð Bjarmason wrote:\n>\n>> On Tue, Oct 19 2021, Johannes Schindelin wrote:\n>>\n>> > On Mon, 18 Oct 2021, Junio C Hamano wrote:\n>> >\n>> >> * js/scalar (2021-10-07) 15 commits\n>> >>  - scalar: accept -C and -c options before the subcommand\n>> >>  - scalar: implement the `version` command\n>> >>  - scalar: implement the `delete` command\n>> >>  - scalar: teach 'reconfigure' to optionally handle all registered enlistments\n>> >>  - scalar: allow reconfiguring an existing enlistment\n>> >>  - scalar: implement the `run` command\n>> >>  - scalar: teach 'clone' to support the --single-branch option\n>> >>  - scalar: implement the `clone` subcommand\n>> >>  - scalar: implement 'scalar list'\n>> >>  - scalar: let 'unregister' handle a deleted enlistment directory gracefully\n>> >>  - scalar: 'unregister' stops background maintenance\n>> >>  - scalar: 'register' sets recommended config and starts maintenance\n>> >>  - scalar: create test infrastructure\n>> >>  - scalar: start documenting the command\n>> >>  - scalar: create a rudimentary executable\n>> >>\n>> >>  Add pieces from \"scalar\" to contrib/.\n>> >>\n>> >>  What's the status of this thing?\n>> >\n>> > As far as I am concerned, the current status is: We agreed that this\n>> > thing _can_ live in contrib/, and that the `scalar` command itself\n>> > should not be integrated deeply into Git because the end game is for\n>> > `git clone` (and maybe `git maintenance`) to learn Scalar's tricks.\n>> >\n>> > A concern was raised that `make -C contrib/scalar` does not rebuild\n>> > `libgit.a` whenever any of `libgit.a`'s source files were modified. In\n>> > light of the previous paragraph, I believe that my time would be\n>> > better spent on designing a new `git clone` option, though, than to\n>> > spend time on a build process that will be soon obsolete (except if I\n>> > allow myself to be distracted by things like teaching `make -C\n>> > contrib/scalar` to know about `libgit.a`'s prerequisites). In other\n>> > words, it is a technical debt I firmly believe is worth accruing.\n>> >\n>> > Other than that, I heard no objections, therefore I believe that this\n>> > is ready for `next`, to be cooked in the v2.34 cycle.\n>>\n>> Your patches as they stand don't implement a \"make install{-doc,-man}\"\n>> for the new command.\n>\n> Right. They are just a start.\n>\n> I would like to direct your attention to\n> https://github.com/microsoft/git/compare/vfs-2.33.0...dscho:vfs-with-scalar,\n> which has a more complete picture of what I have.\n\nOkey, seems to be general scalar features from a quick glance...\n\n> It is a thicket of 8 patch series. I would like to hold your horses until\n> it is time for me to submit `include-scalar-in-build`, in particular\n> https://github.com/dscho/git/commit/473ca8ae673.\n\n...the patches I've got on top of your series are:\n\n    9 files changed, 36 insertions(+), 162 deletions(-)\n\nWhich already do the installation step and fix dependency issues you\nhave etc. Then this linked patch above is:\n\n    Showing with 51 additions and 0 deletions.\n\nSo we're ~200 lines in with Makefile logic that we could demonstrably\nget in a much easier way, and this still doesn't address some of the\nintegration bugs.\n\n>> I'm happy to help you make that work, but I don't think framing it as\n>> some abstract objection about whether something lives in contrib or not\n>> is accurate.\n>\n> Scalar is headed to contrib/ _specifically_ to make it clear that it is\n> _not_ a core part of Git. I laid out the reasons before: the user\n> interface of the Scalar executable is already in use, and hence\n> non-negotiable.\n\nThis invariant that something must be in a given directory so that we\ncommunicate that it's not a \"core part\" is, I think, something you or\nStolee came up with. My reading of Junio's messages on the matter is\nthat he'd be OK with it either way.\n\nIn any case, what I've also mentioned to you is that moving it it out of\ncontrib isn't necessary for the changes I'm proposing.\n\nE.g. the build process could with a couple of more rules just symlink\nthose for the duration of the build, or all the wildcards involved could\nbe adjusted. It would still be simpler than your implementation.\n\nBut since all of that would be *indistinguishable to anyone using git*,\nsince the difference would go away with \"make install\" I really don't\nsee why you think it's necessary over say a comment at the top of each\nfile, naming the files contrib-scalar.c etc.\n\nI.e. we're *only* talking about a difference seen by people who\ncontribute to git, which is a handful of people reading this ML for the\npurposes of this discussion.\n\nIf those people know that scalar's integration & maintenance status is\nso-and-so why does an implementation detail of the build system matter?\nAnd if one way of doing that is demonstrably much simpler, why not go\nfor that?\n\nWho are these people that will see some files in the top-level directory\nas opposed to contrib/* and become confused?\n\n> Since it won't be part of core Git, I fail to see the urgency to integrate\n> its build process more closely into Git's build process, _right now_.\n\nI think the diffstats make it evident that you're wrong about what\nconstitutes closer integration.\n\nJust because two parts of a program live in different files or different\nplaces on a filesystem doesn't mean that they're not more logically\nentangled.\n\nYou already have a hard dependency on git's make process and dependency\nlogic for this subdirectory, the question is whether that needs to be\nthis complex. It doesn't.\n\nHaving to have the two communicate over 2+ Makefiles makes that\nintegration closer and more complex, not more detached.\n\n>> For example in your just-sent[2] you say:\n>>\n>>     I would like to add a plug for Scalar here. Maybe we can link to this\n>>     \"opinionated tool based on Git\" here? I wouldn't ask if I didn't _know_\n>>     that it helps monorepo users out there.\n>>\n>> I agree that would be useful, but currently our documentation build\n>> would fail if you linked to the scalar from other git documentation.\n>> Since we lint it and check if the linkgit:* crosslinks would be 404'd.\n>\n> The link I was implying was\n> https://github.com/microsoft/git/blob/HEAD/contrib/scalar/docs/index.md.\n> Sorry for not spelling it out clearly.\n\nYes, but that's dodging the issue. Will we never want to have a\n\"linkgit:scalar[1]\" anywhere else in git's documentation referring to\nit? Or to refer from scalar's documentation to git's?\n\nYou do have the latter already in your patches, it's just not lint'ed in\nyour version of the patches.\n\nJust like the sources aren't run against \"make coccicheck\". Any such\nproblem is small in isolation, but we've got various \"make\" integrations\nlike that.\n\n>> I don't see why wouldn't consider an up-front solution to that technical\n>> debt, or why you're seemingly ignoring comments about aspects of your\n>> patches that are broken or will cause that unnecessary technical debt.\n>\n> One of the many reasons why one might want to accrue technical debt, and\n> it is my reason in this context, is the expectation that it won't need to\n> be paid down at all because we will eventually just delete contrib/scalar/\n> in a couple of years, when it has served its purpose.\n\nThat sounds good, and in my version of the Makefile integration that'll\nbe removing a line or two referring to \"scalar\" somewhere.\n\nIn yours it'll be a lot more lines, not counting any shimmying we accrue\nin the meantime to e.g. make doc lints and the like work for this\nspecial-case.\n\n>> It would be a hassle to deal with when it comes to various build-system\n>> integration we already have, or which I have WIP work to implement. I'm\n>> also offering to fix it for you, so it wouldn't be much of a distraction\n>> to your efforts.\n>\n> Unfortunately, it is very much a distraction of my efforts. Not only would\n> your patches force me to spend more time to rework and adapt my patches to\n> your changes, as they _specifically_ touch the same code that I am working\n> on. It is also forcing me to spend time on reading all your mails, and on\n> writing mails like this one.\n\nWell, you and me both. The reason I hacked up this alternate\nimplementation for you is because your proposed patches semantically\nconflicted with Makefile improvements I've got locally.\n\nAside from any problems I'd have with that it seems to me that you'd\nbenefit more from the version of the integration I hacked up,\nspecifically we'll always build and test scalar, we just won't install\nunless asked. So you'll get CI etc. integration from day one.\n\nI think (but I'm not sure as I write this) that in some earlier version\nof your patches scalar was truly optional, but even in your v1 it's\nadded to \"OBJECTS\", but commit message of the 1st patch still says:\n\n    The idea here is that you can (optionally) build Scalar via\n\n        make -C contrib/scalar/Makefile\n\n    This will build the `scalar` executable and put it into the\n    contrib/scalar/ subdirectory.\n\nNow, I think we should just build/test the thing unconditionally, and\nmake installation optional, regardless of any question of where it lives\nin-tree.\n\nBut aside from that this integration of building it but not testing it\nseemsl like the worst of both worlds. I.e. it's not \"truly contrib\" in\nthat anyone working in-tree can ignore it, and \"upstream\" needs to deal\nwith any changes, but if you break it you might not notice for a while,\nas we don't run the tests.\n"},{"id":"439389","messageId":"nycvar.QRO.7.76.6.2110221734530.62@tvgsbejvaqbjf.bet","threadId":"56737","inReplyTo":"211022.868rylkuw7.gmgdl@evledraar.gmail.com","subject":"Re: js/scalar, was Re: What's cooking in git.git (Oct 2021, #05; Mon, 18)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2021-10-22T15:55:45Z","receivedAt":"2021-10-22T15:55:54Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Ævar,\n\nOn Fri, 22 Oct 2021, Ævar Arnfjörð Bjarmason wrote:\n\n> On Thu, Oct 21 2021, Johannes Schindelin wrote:\n>\n> > tl;dr it isn't worth your nor my time for you to focus on the build\n> > process in contrib/scalar/ at this moment.\n\nI still stand by these words, and I think you completely glanced over this\nproblem. Your focus seems to lie exclusively on those \"dependency\nproblems\". But apart from you, who cares if `libgit.a` is not rebuilt in\nobscure and rare circumstances _when building something in `contrib/`_?\nThe code in `contrib/scalar/` is transitional.\n\nJust forget about Scalar's build process. Forget about getting its CI to\nwork. I have all that figured out already. It is all working as well as\nneeded.\n\n> > Having said that, I do appreciate your interest in this patch series, and\n> > I have suggestions at the end of this mail how we could collaborate on it\n> > in a more fruitful manner.\n\nI would still like to invite you to think along more productive lines.\nIt's not about where Scalar's build mechanics are right now. It's where we\ncan take _Git_ to do what Scalar already does.\n\nCiao,\nDscho\n\n> [... skipping a lot of talk about \"fixing\" the build problems that I do\n> not consider problems at all at this stage, and probably also not later\n> because I want Scalar _not_ to be integrated more closely into Git's\n> build process as I have pointed out multiple times even while you are\n> continuously trying to push for the exact opposite of that and I am\n> starting to feel a bit unheard...]\n"},{"id":"439644","messageId":"211026.86lf2gym9u.gmgdl@evledraar.gmail.com","threadId":"56737","inReplyTo":"nycvar.QRO.7.76.6.2110221734530.62@tvgsbejvaqbjf.bet","subject":"Re: js/scalar, was Re: What's cooking in git.git (Oct 2021, #05; Mon, 18)","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2021-10-26T12:20:55Z","receivedAt":"2021-10-26T12:59:45Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Fri, Oct 22 2021, Johannes Schindelin wrote:\n\n> Hi Ævar,\n>\n> On Fri, 22 Oct 2021, Ævar Arnfjörð Bjarmason wrote:\n>\n>> On Thu, Oct 21 2021, Johannes Schindelin wrote:\n>>\n>> > tl;dr it isn't worth your nor my time for you to focus on the build\n>> > process in contrib/scalar/ at this moment.\n>\n> I still stand by these words, and I think you completely glanced over this\n> problem. Your focus seems to lie exclusively on those \"dependency\n> problems\". But apart from you, who cares if `libgit.a` is not rebuilt in\n> obscure and rare circumstances _when building something in `contrib/`_?[...]\n\nYou glanced over and didn't reply to the \"This invariant that something\nmust be[...]\" part of the E-Mail you're replying to, which I think gets\nto the crux of the issue.\n\nI.e. you haven't answered why you actively prefer a broken build system\nintegration when a non-broken and less complex one is available, other\nthan some vague and unclear references to the effect that \"it's a\ncontrib thing\", without really explaining what that means, or why it\nnecessitates a broken and more complex build system.\n\nIt's not that libgit.a isn't rebuilt, that part isn't broken, it's built\nby the top-level Makefile. It's that if you:\n\n    make -C contrib/scalar\n\nAnd then change anything it depends on, short of the top-level\nrebuilding libgit.a it won't be re-built, so for anyone hacking on it\nthat Makefile is rather useless. It *does* work to do:\n\n    make contrib/scalar/scalar\n\nBecause that uses the top-level Makefile, will inspect\ncontrib/scalar/.depends etc. So your patches already mostly make\ncontrib/scalar/Makefile redundant anyway, hence my question about (and\npatches) why we can't just drop it entirely.\n\nAs an aside your commit message instructs users to run:\n\n     make -C contrib/scalar/Makefile\n\nBut that command can't work (you either meant -f <path>, or -C <dir>).\n\nYou keep narrowly focusing on the bit where your *.o dependencies are\nbroken, but I've pointed out a bunch of other things that are broken,\nincluding but not limited to: \"make TAGS coccicheck check-docs install\ninstall-doc\" etc.\n\n> [...]The code in `contrib/scalar/` is transitional.[...]\n\nOK. But it's being proposed for merge to \"master\", I don't see how \"we\ndon't expect this to stay for long\" translates into \"it's OK that it's\nbroken while it's here\".\n \n> Just forget about Scalar's build process. Forget about getting its CI to\n> work. I have all that figured out already. It is all working as well as\n> needed.\n\nYou're proposing to integrate this into git.git, so it really does\nmatter that it's useful to others and plays well with existing\ncomponents.\n\nWhen a release of this is available we'd expect third-party packagers to\nconsider installing it alongside git. If that's not at all the intent\nthen at the very least the commit messages & documentation are sorely\nlacking.\n\nAnd it's not OK that some in-tree *.c code that uses various bits of\nlibgit.a and will break if changes to that code don't take it into\naccount doesn't have meaningful testing CI/integration.\n\nE.g. I was hacking on something the other day, and since I build (my\nversion of) your scalar patches had a breakage due (my local changes to)\nan API where scalar was the one remaining in-tree user of an API\nfunction. Luckily I ran its tests by default, and didn't need to go out\nof my way to do so.\n\nAll of the above is in the context that I've offered you patches to fix\nall these issues.\n\nI haven't sent anything but an inline WIP demo of that to the list\nbecause we're still having this discussion where you're categorically\nrefusing to even consider fixes to things in your series that are\ndemonstrably broken.\n\n>> > Having said that, I do appreciate your interest in this patch series, and\n>> > I have suggestions at the end of this mail how we could collaborate on it\n>> > in a more fruitful manner.\n>\n> I would still like to invite you to think along more productive lines.\n> It's not about where Scalar's build mechanics are right now. It's where we\n> can take _Git_ to do what Scalar already does.\n\nThat's also interesting, but right now we're not discussing that\nsubsequent set of patches, but your integration of scalar in-tree. Let's\nfix those issues first.\n"},{"id":"439816","messageId":"YXmn1yZgDHHz6TWa@google.com","threadId":"56737","inReplyTo":"xmqq1r4hv7bv.fsf@gitster.g","subject":"Re: What's cooking in git.git (Oct 2021, #05; Mon, 18)","fromName":"Emily Shaffer","fromEmail":"emilyshaffer@google.com","sentAt":"2021-10-27T19:26:15Z","receivedAt":"2021-10-27T19:26:22Z","isPatch":false,"sender":{"key":"nasamuffin@google.com","avatar":"https://avatars.githubusercontent.com/u/1606826?v=4"},"body":"Pretty late sending this, so I'll try to include newer versions since\nthis mail came out last week, too.\n\nOn Mon, Oct 18, 2021 at 11:48:04PM -0700, Junio C Hamano wrote:\n> [New Topics]\n> \n> * gc/remote-with-fewer-static-global-variables (2021-10-13) 3 commits\n>  - remote: add struct repository parameter to external functions\n>  - remote: use remote_state parameter internally\n>  - remote: move static variables into per-repository struct\n> \n>  Code clean-up to eventually allow information on remotes defined\n>  for an arbitrary repository to be read.\n> \n>  Will merge to 'next'?\n\nSounds like there was a segfault reported on v3 (sent 2021-10-19, so\nbetween this mail going out and now). Glen says he is working on reroll.\n\nv3:\nhttps://lore.kernel.org/git/20211019224339.61881-1-chooglen@google.com/\n\n> * ab/config-based-hooks-2 (2021-10-15) 14 commits\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>  - merge: convert post-merge to use hook.h\n>  - hooks: convert 'post-checkout' hook to hook library\n>  - am: convert applypatch to use hook.h\n>  - rebase: convert pre-rebase to use hook.h\n>  - gc: use hook library for pre-auto-gc hook\n>  - hook: add 'run' subcommand\n>  - Merge branch 'ab/config-based-hooks-1' into ab/config-based-hooks-2\n> \n>  More \"config-based hooks\".\n> \n>  Breaks t2400.\n\nI see Ævar posted a reroll\n(https://lore.kernel.org/git/cover-v3-00.13-00000000000-20211019T231647Z-avarab@gmail.com/).\nI reviewed the prior version, but my review is not very useful since I\nwrote many of these patches in the first place. So others who can\nprovide review would be doing me (and Ævar!) a favor (and I'd be happy\nto trade review-for-review if needed ;) )\n\n> * js/branch-track-inherit (2021-10-18) 1 commit\n>  - branch: add flags and config to inherit tracking\n> \n>  \"git -c branch.autosetupmerge=inherit branch new old\" makes \"new\"\n>  to have the same upstream as the \"old\" branch, instead of marking\n>  \"old\" itself as its upstream.\n> \n>  Under discussion.\n>  cf. <87a6j6tbsv.fsf@gmgdl.gmail.com>\n\nI think Josh is waiting for discussion to settle before a reroll.\n\n> --------------------------------------------------\n> [Stalled]\n> \n> * ar/submodule-update (2021-10-13) 9 commits\n>  . submodule--helper: rename helper functions\n>  . submodule--helper: remove unused helpers\n>  . submodule: move core cmd_update() logic to C\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: rename helpers for update-clone\n>  . submodule--helper: get remote names from any repository\n>  . submodule--helper: split up ensure_core_worktree()\n> \n>  Rewrite of \"git submodule update\" in C.\n> \n>  Kicked out of 'seen' to make room for es/superproject-aware-submodules\n>  which is among the topics this topic stomps on.\n\nThe latest version of es/superproject-aware-submodules is starved for\nreview. I'd appreciate eyes on it (and can swap review for review if\nfolks need.)\n\n> --------------------------------------------------\n> [Cooking]\n> \n> * es/superproject-aware-submodules (2021-10-14) 4 commits\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>  Will merge to 'next'?\n\nSounds like Jonathan Tan asked for an additional test and a small fixup.\nI can either send a squash patch or a reroll - your preference.\n\n> * jt/no-abuse-alternate-odb-for-submodules (2021-10-08) 9 commits\n>   (merged to 'next' on 2021-10-14 at ae49a2ceda)\n>  + submodule: trace adding submodule ODB as alternate\n>  + submodule: pass repo to check_has_commit()\n>  + object-file: only register submodule ODB if needed\n>  + merge-{ort,recursive}: remove add_submodule_odb()\n>  + refs: peeling non-the_repository iterators is BUG\n>  + refs: teach arbitrary repo support to iterators\n>  + refs: plumb repo into ref stores\n>  + Merge branch 'jk/ref-paranoia' into jt/no-abuse-alternate-odb-for-submodules\n>  + Merge branch 'jt/add-submodule-odb-clean-up' into jt/no-abuse-alternate-odb-for-submodules\n> \n>  Follow through the work to use the repo interface to access\n>  submodule objects in-process, instead of abusing the alternate\n>  object database interface.\n> \n>  Will merge to 'master'.\n\nThanks, glad to see it go in.\n\nAdditionally:\n\nhttps://lore.kernel.org/git/cover.1634077795.git.jonathantanmy@google.com/\n\n  Jonathan is planning on sending a v2 soon - \"hopefully this week.\"\n\nThanks all.\n\n - Emily\n"},{"id":"439848","messageId":"xmqqr1c6t42v.fsf@gitster.g","threadId":"56737","inReplyTo":"211026.86lf2gym9u.gmgdl@evledraar.gmail.com","subject":"Re: js/scalar, was Re: What's cooking in git.git (Oct 2021, #05; Mon, 18)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-10-27T23:56:08Z","receivedAt":"2021-10-27T23:56:12Z","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> It's not that libgit.a isn't rebuilt, that part isn't broken, it's built\n> by the top-level Makefile. It's that if you:\n>\n>     make -C contrib/scalar\n>\n> And then change anything it depends on, short of the top-level\n> rebuilding libgit.a it won't be re-built, so for anyone hacking on it\n> that Makefile is rather useless.\n\nIs this merely an example, or is this the only thing you cared about\nthe build procedure?\n\n>> I would still like to invite you to think along more productive lines.\n>> It's not about where Scalar's build mechanics are right now. It's where we\n>> can take _Git_ to do what Scalar already does.\n>\n> That's also interesting, but right now we're not discussing that\n> subsequent set of patches, but your integration of scalar in-tree. Let's\n> fix those issues first.\n\n"}]}