{"thread":{"id":"57609","subject":"What's cooking in git.git (Mar 2022, #05; Wed, 23)","startedAt":"2022-03-24T03:13:17Z","lastAt":"2022-03-27T13:18:32Z","messageCount":6,"participants":["Junio C Hamano","Ævar Arnfjörð Bjarmason","Fernando Ramos"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"452082","messageId":"xmqqwngkm4am.fsf@gitster.g","threadId":"57609","inReplyTo":null,"subject":"What's cooking in git.git (Mar 2022, #05; Wed, 23)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-03-24T03:13:05Z","receivedAt":"2022-03-24T03:13:17Z","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\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/plug-random-leaks (2022-03-17) 2 commits\n (merged to 'next' on 2022-03-17 at 381101b075)\n + diff.c: fix a double-free regression in a18d66cefb\n + tests: demonstrate \"show --word-diff --color-moved\" regression\n\n Double-free fix for a recently merged topic.\n source: \n\n\n* ab/reflog-prep-fix (2022-03-13) 1 commit\n (merged to 'next' on 2022-03-15 at c9ef333999)\n + reflog: don't be noisy on empty reflogs\n\n Regression fix.\n source: \n\n\n* ac/test-lazy-fetch (2022-03-16) 1 commit\n (merged to 'next' on 2022-03-17 at 11eb486b7f)\n + partial-clone: add a partial-clone test case\n\n A new test to ensure a lazy fetching is not triggered when it\n should not be.\n source: \n\n\n* bc/block-sha1-without-gcc-asm-extension (2022-03-10) 1 commit\n (merged to 'next' on 2022-03-15 at e285d9988f)\n + block-sha1: remove use of obsolete x86 assembly\n\n Get rid of one use of __asm__() GCC extension that does not help us\n much these days, which has an added advantage of not having to\n worry about -pedantic complaining.\n source: <20220310174750.4166514-1-sandals@crustytoothpaste.net>\n\n\n* dc/complete-restore (2022-03-15) 1 commit\n (merged to 'next' on 2022-03-17 at 34a4fd8796)\n + completion: tab completion of filenames for 'git restore'\n\n The command line completion support (in contrib/) learns to give\n modified paths to the \"git restore\" command.\n source: \n\n\n* ds/doc-maintenance-synopsis-fix (2022-03-15) 1 commit\n (merged to 'next' on 2022-03-17 at eb26e034a3)\n + maintenance: fix synopsis in documentation\n\n Doc update.\n source: \n\n\n* ds/partial-bundles (2022-03-09) 13 commits\n (merged to 'next' on 2022-03-13 at 03529eaa59)\n + clone: fail gracefully when cloning filtered bundle\n + bundle: unbundle promisor packs\n + bundle: create filtered bundles\n + rev-list: move --filter parsing into revision.c\n + bundle: parse filter capability\n + list-objects: handle NULL function pointers\n + MyFirstObjectWalk: update recommended usage\n + list-objects: consolidate traverse_commit_list[_filtered]\n + pack-bitmap: drop filter in prepare_bitmap_walk()\n + pack-objects: use rev.filter when possible\n + revision: put object filter into struct rev_info\n + list-objects-filter-options: create copy helper\n + index-pack: document and test the --promisor option\n (this branch is used by ds/bundle-uri.)\n\n Bundle file format gets extended to allow a partial bundle,\n filtered by similar criteria you would give when making a\n partial/lazy clone.\n source: \n\n\n* ep/remove-duplicated-includes (2022-03-14) 6 commits\n (merged to 'next' on 2022-03-15 at 0f87385b56)\n + attr.h: remove duplicate struct definition\n + t/helper/test-run-command.c: delete duplicate include\n + builtin/stash.c: delete duplicate include\n + builtin/sparse-checkout.c: delete duplicate include\n + builtin/gc.c: delete duplicate include\n + attr.c: delete duplicate include\n\n Code clean-up.\n source: <20220313195536.224075-1-gitter.spiros@gmail.com>\n\n\n* ep/t6423-modernize (2022-03-13) 1 commit\n (merged to 'next' on 2022-03-15 at d37f7359bf)\n + t6423-merge-rename-directories.sh: use the $(...) construct\n\n Code clean-up.\n source: <20220313172829.215517-1-gitter.spiros@gmail.com>\n\n\n* ep/test-malloc-check-with-glibc-2.34 (2022-03-09) 2 commits\n (merged to 'next' on 2022-03-12 at 13ed9014e6)\n + test-lib: declare local variables as local\n (merged to 'next' on 2022-03-08 at 810ac5a1d3)\n + test-lib.sh: Use GLIBC_TUNABLES instead of MALLOC_CHECK_ on glibc >= 2.34\n\n The method to trigger malloc check used in our tests no longer work\n with newer versions of glibc.\n source: <81f43fbefde84ab7af9ee2ac760845b728a48ab5.1646861976.git.git@grubix.eu>\n\n\n* gc/submodule-update-part1 (2022-03-04) 13 commits\n (merged to 'next' on 2022-03-15 at 92911dced9)\n + submodule--helper update-clone: check for --filter and --init\n + submodule update: add tests for --filter\n + submodule--helper: remove ensure-core-worktree\n + submodule--helper update-clone: learn --init\n + submodule--helper: allow setting superprefix for init_submodule()\n + submodule--helper: refactor get_submodule_displaypath()\n + submodule--helper run-update-procedure: learn --remote\n + submodule--helper: don't use bitfield indirection for parse_options()\n + submodule--helper: get remote names from any repository\n + submodule--helper run-update-procedure: remove --suboid\n + submodule--helper: reorganize code for sh to C conversion\n + submodule--helper: remove update-module-mode\n + submodule tests: test for init and update failure output\n (this branch is used by gc/submodule-update-part2.)\n\n Rewrite of \"git submodule update\" in C (early part).\n source: <20220305001401.20888-1-chooglen@google.com>\n\n\n* jc/cat-file-batch-default-format-optim (2022-03-15) 1 commit\n (merged to 'next' on 2022-03-17 at 2d7f0efefa)\n + cat-file: skip expanding default format\n\n Optimize away strbuf_expand() call with a hardcoded formatting logic\n specific for the default format in the --batch and --batch-check\n options of \"git cat-file\".\n source: \n\n\n* jd/userdiff-kotlin (2022-03-12) 1 commit\n (merged to 'next' on 2022-03-15 at 10fabd722a)\n + userdiff: add builtin diff driver for kotlin language.\n\n A new built-in userdiff driver for kotlin.\n source: <20220312044832.718356-1-jaydeepjd.8914@gmail.com>\n\n\n* jk/name-rev-w-genno (2022-03-13) 1 commit\n (merged to 'next' on 2022-03-15 at b370601916)\n + name-rev: use generation numbers if available\n\n \"git name-rev\" learned to use the generation numbers when setting\n the lower bound of searching commits used to explain the revision,\n when available, instead of committer time.\n source: <20220312000015.3643427-1-jacob.e.keller@intel.com>\n\n\n* js/in-place-reverse-in-sequencer (2022-03-16) 1 commit\n (merged to 'next' on 2022-03-17 at e69c91c5f5)\n + sequencer: use reverse_commit_list() helper\n\n Code clean-up.\n source: \n\n\n* jy/gitweb-no-need-for-meta (2022-03-08) 2 commits\n (merged to 'next' on 2022-03-13 at 1e8d643130)\n + gitweb: remove invalid http-equiv=\"content-type\"\n + comment: fix typo\n\n Remove unneeded from gitweb\n output.\n source: <20220308155612.105957-3-jason@jasonyundt.email>\n\n\n* ps/repack-with-server-info (2022-03-14) 2 commits\n (merged to 'next' on 2022-03-17 at aafa287b91)\n + repack: add config to skip updating server info\n + repack: refactor to avoid double-negation of update-server-info\n\n \"git repack\" learned a new configuration to disable triggering of\n age-old \"update-server-info\" command, which is rarely useful these\n days.\n source: \n\n\n* pw/single-key-interactive (2022-02-23) 4 commits\n (merged to 'next' on 2022-03-13 at 02fd6aca2f)\n + add -p: disable stdin buffering when interactive.singlekey is set\n + terminal: set VMIN and VTIME in non-canonical mode\n + terminal: pop signal handler when terminal is restored\n + terminal: always reset terminal when reading without echo\n (this branch is used by pw/add-p-single-key.)\n\n The single-key interactive operation used by \"git add -p\" has been\n made more robust.\n source: \n\n\n* sm/no-git-in-upstream-of-pipe-in-tests (2022-03-12) 3 commits\n (merged to 'next' on 2022-03-12 at 9e6f538b36)\n + t0030-t0050: avoid pipes with Git on LHS\n + t0001-t0028: avoid pipes with Git on LHS\n (merged to 'next' on 2022-03-08 at 3ff4e5c09c)\n + t0003: avoid pipes with Git on LHS\n\n Test fixes.\n source: <20220223115347.3083-1-shivam828787@gmail.com>\n\n--------------------------------------------------\n[New Topics]\n\n* ab/refs-various-fixes (2022-03-17) 5 commits\n (merged to 'next' on 2022-03-18 at d65ed663a7)\n + refs debug: add a wrapper for \"read_symbolic_ref\"\n + packed-backend: remove stub BUG(...) functions\n + misc *.c: use designated initializers for struct assignments\n + refs: use designated initializers for \"struct ref_iterator_vtable\"\n + refs: use designated initializers for \"struct ref_storage_be\"\n\n Code clean-up.\n\n Will merge to 'master'.\n source: \n\n\n* ab/reflog-parse-options (2022-03-23) 8 commits\n - reflog [show]: display sensible -h output\n - reflog: convert to parse_options() API\n - reflog exists: use parse_options() API\n - git reflog [expire|delete]: make -h output consistent with SYNOPSIS\n - reflog: move \"usage\" variables and use macros\n - reflog tests: add missing \"git reflog exists\" tests\n - reflog: refactor cmd_reflog() to \"if\" branches\n - reflog.c: indent argument lists\n\n \"git reflog\" command now uses parse-options API to parse its\n command line options.\n\n Will merge to 'next'?\n source: \n\n\n* jt/reset-grafts-when-resetting-shallow (2022-03-17) 1 commit\n (merged to 'next' on 2022-03-21 at 7030392f37)\n + shallow: reset commit grafts when shallow is reset\n\n When \"shallow\" information is updated, we forgot to update the\n in-core equivalent, which has been corrected.\n\n Will merge to 'master'.\n source: <20220317182448.1633847-1-jonathantanmy@google.com>\n\n\n* ab/make-optim-noop (2022-03-21) 1 commit\n (merged to 'next' on 2022-03-23 at ea8e0bdc37)\n + Makefile: use ' ', not non-existing $(wspfx_SQ)\n\n A micro fix to a topic earlier merged to 'master'\n\n Will merge to 'master'.\n source: \n\n\n* kf/p4-multiple-remotes (2022-03-21) 1 commit\n - git-p4: fix issue with multiple perforce remotes\n\n source: \n\n\n* ab/racy-hooks (2022-03-23) 1 commit\n - hooks: fix \"invoked hook\" regression in a8cc5943338\n\n Will merge to 'next'.\n source: \n\n\n* ds/partial-bundle-more (2022-03-23) 5 commits\n - bundle: output hash information in 'verify'\n - bundle: move capabilities to end of 'verify'\n - pack-objects: parse --filter directly into revs.filter\n - pack-objects: move revs out of get_object_list()\n - list-objects-filter: remove CL_ARG__FILTER\n\n Code clean-up.\n\n Will merge to 'next'?\n source: \n\n\n* fr/vimdiff-layout (2022-03-23) 3 commits\n - vimdiff: integrate layout tests in the unit tests framework ('t' folder)\n - vimdiff: add tool documentation\n - vimdiff: new implementation with layout support\n\n Reimplement \"vimdiff[123]\" mergetool drivers with a more generic\n layout mechanism.\n\n Will merge to 'next'?\n source: <20220319091141.4911-1-greenfoo@u92.eu>\n\n--------------------------------------------------\n[Stalled]\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 discard; getting tired of waiting\n cf. <220204.864k5e4yvf.gmgdl@evledraar.gmail.com>\n source: <20220128194811.3396281-1-robin.jarry@6wind.com>\n\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 Will discard; getting tired of waiting\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 Will discard; getting tired of waiting\n cf. \n source: <20211202035446.1154-1-carenas@gmail.com>\n\n--------------------------------------------------\n[Cooking]\n\n* bc/stash-export (2022-03-16) 6 commits\n - doc: add stash export and import to docs\n - builtin/stash: provide a way to import stashes from a ref\n - builtin/stash: provide a way to export stashes to a ref\n - object-name: make get_oid quietly return an error\n - builtin/stash: fill in all commit data\n - builtin/stash: factor out generic function to look up stash info\n\n A mechanism to export and import stash entries to and from a normal\n commit to transfer it across repositories has been introduced.\n\n Expecting a reroll.\n source: <20220310173236.4165310-1-sandals@crustytoothpaste.net>\n\n\n* gc/submodule-update-part2 (2022-03-16) 8 commits\n - submodule--helper: remove forward declaration\n - submodule: move core cmd_update() logic to C\n - submodule--helper: reduce logic in run_update_procedure()\n - submodule--helper: teach update_data more options\n - builtin/submodule--helper.c: rename option struct to \"opt\"\n - submodule update: use die_message()\n - submodule--helper: run update using child process struct\n - Merge branch 'gc/submodule-update-part1' into gc/submodule-update-part2\n\n Move more \"git submodule update\" to C.\n\n Will merge to 'next'?\n source: <20220315210925.79289-1-chooglen@google.com>\n\n\n* ns/batch-fsync (2022-03-21) 8 commits\n - core.fsyncmethod: performance tests for add and stash\n - core.fsyncmethod: tests for batch mode\n - core.fsync: use batch mode and sync loose objects by default on Windows\n - unpack-objects: use the bulk-checkin infrastructure\n - update-index: use the bulk-checkin infrastructure\n - core.fsyncmethod: batched disk flushes for loose-objects\n - bulk-checkin: rename 'state' variable and separate 'plugged' boolean\n - Merge branch 'ns/core-fsyncmethod' into ns/batch-fsync\n (this branch uses ns/core-fsyncmethod.)\n\n Introduce a filesystem-dependent mechanism to optimize the way the\n bits for many loose object files are ensured to hit the disk\n platter.\n source: \n\n\n* vd/cache-bottom-fix (2022-03-17) 3 commits\n (merged to 'next' on 2022-03-21 at 6760b84f38)\n + Revert \"unpack-trees: improve performance of next_cache_entry\"\n + unpack-trees: increment cache_bottom for sparse directories\n + t1092: add sparse directory before cone in test repo\n\n Correct a bug in unpack-trees introduced earlier.\n\n Will merge to 'master'.\n source: \n\n\n* ns/core-fsyncmethod (2022-03-15) 6 commits\n (merged to 'next' on 2022-03-17 at c8a52f8cbe)\n + core.fsync: documentation and user-friendly aggregate options\n + core.fsync: new option to harden the index\n + core.fsync: add configuration parsing\n + core.fsync: introduce granular fsync control infrastructure\n + core.fsyncmethod: add writeout-only mode\n + wrapper: make inclusion of Windows csprng header tightly scoped\n (this branch is used by ns/batch-fsync and ps/fsync-refs.)\n\n Replace core.fsyncObjectFiles with two new configuration variables,\n core.fsync and core.fsyncMethod.\n\n Will merge to 'master'.\n source: \n\n\n* pw/add-p-single-key (2022-03-16) 5 commits\n (merged to 'next' on 2022-03-23 at a00396d9a1)\n + terminal: restore settings on SIGTSTP\n + terminal: work around macos poll() bug\n + terminal: don't assume stdin is /dev/tty\n + terminal: use flags for save_term()\n + Merge branch 'pw/single-key-interactive' into pw/add-p-single-key\n\n Finishing touches to C rewrite of \"git add -i\" in single-key\n interactive mode.\n\n Will merge to 'master'.\n source: <20220316185405.29551-5-phillip.wood123@gmail.com>\n\n\n* en/sparse-cone-becomes-default (2022-03-13) 9 commits\n - Documentation: some sparsity wording clarifications\n - git-sparse-checkout.txt: mark non-cone mode as deprecated\n - git-sparse-checkout.txt: flesh out non-cone mode pattern discussion a bit\n - git-sparse-checkout.txt: add a new EXAMPLES section\n - git-sparse-checkout.txt: shuffle some sections and mark as internal\n - git-sparse-checkout.txt: update docs for deprecation of 'init'\n - git-sparse-checkout.txt: wording updates for the cone mode default\n - sparse-checkout: make --cone the default\n - tests: stop assuming --no-cone is the default mode for sparse-checkout\n\n source: \n\n\n* jc/rebase-detach-fix (2022-03-18) 2 commits\n (merged to 'next' on 2022-03-21 at 1eb51c65c9)\n + rebase: set REF_HEAD_DETACH in checkout_up_to_date()\n + rebase: use test_commit helper in setup\n\n \"git rebase $base $non_branch_commit\", when $base is an ancestor or\n the $non_branch_commit, modified the current branch, which has been\n corrected.\n\n Will merge to 'master'.\n source: \n\n\n* ps/fsync-refs (2022-03-15) 2 commits\n (merged to 'next' on 2022-03-17 at 9e007c1178)\n + core.fsync: new option to harden references\n + Merge branch 'ns/core-fsyncmethod' into ps/fsync-refs\n (this branch uses ns/core-fsyncmethod.)\n\n Updates to refs traditionally weren't fsync'ed, but we can\n configure using core.fsync variable to do so.\n\n Will merge to 'master'.\n source: <47dd79106b93bb81750320d50ccaa74c24aacd28.1646992380.git.ps@pks.im>\n\n\n* vd/stash-silence-reset (2022-03-23) 8 commits\n (merged to 'next' on 2022-03-23 at 932f4f6529)\n + reset: remove 'reset.refresh' config option\n + reset: remove 'reset.quiet' config option\n + reset: do not make '--quiet' disable index refresh\n (merged to 'next' on 2022-03-17 at c469159b61)\n + stash: make internal resets quiet and refresh index\n + reset: suppress '--no-refresh' advice if logging is silenced\n + reset: replace '--quiet' with '--no-refresh' in performance advice\n + reset: introduce --[no-]refresh option to --mixed\n + reset: revise index refresh advice\n\n \"git stash\" does not allow subcommands it internally runs as its\n implementation detail, except for \"git reset\", to emit messages;\n now \"git reset\" part has also been squelched.\n\n Will merge to 'master'.\n source: \n source: \n\n\n* tl/ls-tree-oid-only (2022-03-23) 15 commits\n - ls-tree: split up \"fast path\" callbacks\n - ls-tree: detect and error on --name-only --name-status\n - ls-tree: support --object-only option for \"git-ls-tree\"\n - ls-tree: introduce \"--format\" option\n - cocci: allow padding with `strbuf_addf()`\n - ls-tree: introduce struct \"show_tree_data\"\n - ls-tree: slightly refactor `show_tree()`\n - ls-tree: fix \"--name-only\" and \"--long\" combined use bug\n - ls-tree: simplify nesting if/else logic in \"show_tree()\"\n - ls-tree: rename \"retval\" to \"recurse\" 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 - ls-tree tests: add tests for --name-status\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/hook-tests-updates (2022-03-17) 13 commits\n (merged to 'next' on 2022-03-23 at 8c35279100)\n + http tests: use \"test_hook\" for \"smart\" and \"dumb\" http tests\n + proc-receive hook tests: use \"test_hook\" instead of \"write_script\"\n + tests: extend \"test_hook\" for \"rm\" and \"chmod -x\", convert \"$HOOK\"\n + tests: use \"test_hook\" for misc \"mkdir -p\" and \"chmod\" cases\n + tests: change \"mkdir -p && write_script\" to use \"test_hook\"\n + tests: change \"cat && chmod +x\" to use \"test_hook\"\n + gc + p4 tests: use \"test_hook\", remove sub-shells\n + fetch+push tests: use \"test_hook\" and \"test_when_finished\" pattern\n + bugreport tests: tighten up \"git bugreport -s hooks\" test\n + tests: assume the hooks are disabled by default\n + http tests: don't rely on \"hook/post-update.sample\"\n + hook tests: turn exit code assertions into a loop\n + test-lib-functions: add and use a \"test_hook\" wrapper\n\n Update tests around the use of hook scripts.\n\n Will merge to 'master'.\n source: \n\n\n* jc/mailsplit-warn-on-tty (2022-03-03) 1 commit\n - am/apply: warn if we end up reading patches from terminal\n\n \"git am\" can read from the standard input when no mailbox is given\n on the command line, but the end-user gets no indication when it\n happens, making Git appear stuck.\n source: \n\n\n* tb/cruft-packs (2022-03-02) 17 commits\n - sha1-file.c: don't freshen cruft packs\n - builtin/gc.c: conditionally avoid pruning objects via loose\n - builtin/repack.c: add cruft packs to MIDX during geometric repack\n - builtin/repack.c: use named flags for existing_packs\n - builtin/repack.c: allow configuring cruft pack generation\n - builtin/repack.c: support generating a cruft pack\n - builtin/pack-objects.c: --cruft with expiration\n - reachable: report precise timestamps from objects in cruft packs\n - reachable: add options to add_unseen_recent_objects_to_traversal\n - builtin/pack-objects.c: --cruft without expiration\n - builtin/pack-objects.c: return from create_object_entry()\n - t/helper: add 'pack-mtimes' test-tool\n - pack-mtimes: support writing pack .mtimes files\n - chunk-format.h: extract oid_version()\n - pack-write: pass 'struct packing_data' to 'stage_tmp_packfiles'\n - pack-mtimes: support reading .mtimes files\n - Documentation/technical: add cruft-packs.txt\n\n A mechanism to pack unreachable objects into a \"cruft pack\",\n instead of ejecting them into loose form to be reclaimed later, has\n been introduced.\n\n Waiting for discussion to settle.\n cf. \n source: \n\n\n* js/ci-github-workflow-markup (2022-03-01) 9 commits\n - ci: call `finalize_test_case_output` a little later\n - ci: use `--github-workflow-markup` in the GitHub workflow\n - ci: optionally mark up output in the GitHub workflow\n - test(junit): avoid line feeds in XML attributes\n - tests: refactor --write-junit-xml code\n - ci/run-build-and-tests: add some structure to the GitHub workflow output\n - ci: make it easier to find failed tests' logs in the GitHub workflow\n - ci/run-build-and-tests: take a more high-level view\n - ci: fix code style\n\n Update the GitHub workflow support to make it quicker to get to the\n failing test.\n\n Waiting for discussion to settle.\n cf. <220309.86tuc6lwpj.gmgdl@evledraar.gmail.com>\n cf. <220302.86mti87cj2.gmgdl@evledraar.gmail.com>\n cf. <30dbc8fb-a1db-05bc-3dcb-070e11cf4715@gmail.com>\n source: \n\n\n* et/xdiff-indirection (2022-02-17) 1 commit\n - xdiff: provide indirection to git functions\n\n Insert a layer of preprocessor macros for common functions in xdiff\n codebase.\n\n Expecting a (hopefully final) reroll.\n cf. \n source: <20220217225408.GB7@edef91d97c94>\n\n\n* ab/http-gcc-12-workaround (2022-02-25) 1 commit\n - http API: fix dangling pointer issue noted by GCC 12.0\n\n Work around false warning pre-release of GCC 12.\n source: \n\n\n* jd/prompt-upstream-mark (2022-03-23) 4 commits\n (merged to 'next' on 2022-03-23 at 518404a091)\n + git-prompt: put upstream comments together\n + git-prompt: make long upstream state indicator consistent\n + git-prompt: make upstream state indicator location consistent\n + git-prompt: rename `upstream` to `upstream_type`\n\n Tweaks in the command line prompt (in contrib/) code around its\n GIT_PS1_SHOWUPSTREAM feature.\n\n Will merge to 'master'.\n source: \n\n\n* pw/worktree-list-with-z (2022-02-25) 1 commit\n - worktree: add -z option for list subcommand\n\n \"git worktree list --porcelain\" did not c-quote pathnames and lock\n reasons with unsafe bytes correctly, which is worked around by\n introducing NUL terminated output format with \"-z\".\n\n Expecting a reroll.\n cf. \n source: \n\n\n* rc/fetch-refetch (2022-03-04) 7 commits\n - doc/partial-clone: mention --refetch fetch option\n - fetch: after refetch, encourage auto gc repacking\n - t5615-partial-clone: add test for fetch --refetch\n - fetch: add --refetch option\n - builtin/fetch-pack: add --refetch option\n - fetch-pack: add refetch\n - fetch-negotiator: add specific noop initializer\n\n \"git fetch --refetch\" learned to fetch everything without telling\n the other side what we already have, which is useful when you\n cannot trust what you have in the local object store.\n\n Expecting a reroll.\n cf. \n source: \n\n\n* tk/simple-autosetupmerge (2022-02-25) 2 commits\n - t3200: tests for new branch.autosetupmerge option \"simple\"\n - merge: new autosetupmerge option 'simple' for matching branches\n\n \"git -c branch.autosetupmerge=simple branch $A $B\" will set the $B\n as $A's upstream only when $A and $B shares the same name, and \"git\n -c push.default=simple\" on branch $A would push to update the\n branch $A at the remote $B came from.\n\n Needs review.\n source: \n\n\n* tk/untracked-cache-with-uall (2022-02-25) 1 commit\n - untracked-cache: support '--untracked-files=all' if configured\n\n The performance of the \"untracked cache\" feature has been improved\n when \"--untracked-files=\" and \"status.showUntrackedFiles\"\n are combined.\n\n Expecting a reroll.\n source: \n\n\n* ab/commit-plug-leaks (2022-02-16) 2 commits\n - commit: use strbuf_release() instead of UNLEAK()\n - commit: fix \"author_ident\" leak\n\n Leakfixes in the top-level called-once function.\n\n Expecting a reroll.\n I think UNLEAK->strbuf_release() is a regression.\n source: \n\n\n* jh/builtin-fsmonitor-part3 (2022-03-23) 28 commits\n - t7527: test Unicode NFC/NFD handling on MacOS\n - t/lib-unicode-nfc-nfd: helper prereqs for testing unicode nfc/nfd\n - fsmonitor: on macOS also emit NFC spelling for NFD pathname\n - t7527: test FSMonitor on case insensitive+preserving file system\n - fsmonitor: never set CE_FSMONITOR_VALID on submodules\n - t/perf/p7527: add perf test for builtin FSMonitor\n - t7527: FSMonitor tests for directory moves\n - fsmonitor: optimize processing of directory events\n - fsm-listen-darwin: shutdown daemon if worktree root is moved/renamed\n - fsm-health-win32: force shutdown daemon if worktree root moves\n - fsm-health-win32: add polling framework to monitor daemon health\n - fsmonitor--daemon: stub in health thread\n - fsmonitor--daemon: rename listener thread related variables\n - fsmonitor--daemon: prepare for adding health thread\n - fsmonitor--daemon: cd out of worktree root\n - fsm-listen-darwin: ignore FSEvents caused by xattr changes on macOS\n - unpack-trees: initialize fsmonitor_has_run_once in o->result\n - fsmonitor-settings: NTFS and FAT32 on MacOS are incompatible\n - fsmonitor-settings: remote repos on Windows are incompatible\n - fsmonitor-settings: remote repos on macOS are incompatible\n - fsmonitor-settings: stub in macOS-specific incompatibility checking\n - fsmonitor-settings: VFS for Git virtual repos are incompatible\n - fsmonitor-settings: stub in Win32-specific incompatibility checking\n - fsmonitor-settings: bare repos are incompatible with FSMonitor\n - t/helper/fsmonitor-client: create stress test\n - t7527: test FSMonitor on repos with Unicode root paths\n - fsm-listen-win32: handle shortnames\n - Merge branch 'jh/builtin-fsmonitor-part2' into jh/builtin-fsmonitor-part3\n (this branch uses jh/builtin-fsmonitor-part2.)\n\n More fsmonitor--daemon.\n source: \n\n\n* gc/recursive-fetch-with-unused-submodules (2022-03-16) 10 commits\n (merged to 'next' on 2022-03-17 at 2813b7b1c3)\n + submodule: fix latent check_has_commit() bug\n + fetch: fetch unpopulated, changed submodules\n + submodule: move logic into fetch_task_create()\n + submodule: extract get_fetch_task()\n + submodule: store new submodule commits oid_array in a struct\n + submodule: inline submodule_commits() into caller\n + submodule: make static functions read submodules from commits\n + t5526: create superproject commits with test helper\n + t5526: stop asserting on stderr literally\n + t5526: introduce test helper to assert on fetches\n\n When \"git fetch --recurse-submodules\" grabbed submodule commits\n that would be needed to recursively check out newly fetched commits\n in the superproject, it only paid attention to submodules that are\n in the current checkout of the superproject. We now do so for all\n submodules that have been run \"git submodule init\" on.\n\n Will merge to 'master'.\n source: <20220308001433.94995-1-chooglen@google.com>\n\n\n* js/bisect-in-c (2022-02-23) 14 commits\n - bisect: no longer try to clean up left-over `.git/head-name` files\n - bisect: remove Cogito-related code\n - bisect: turn `git bisect` into a full built-in\n - bisect: move even the option parsing to `bisect--helper`\n - bisect--helper: return only correct exit codes in `cmd_*()`\n - bisect--helper: move the `BISECT_STATE` case to the end\n - bisect--helper: make `--bisect-state` optional\n - bisect--helper: align the sub-command order with git-bisect.sh\n - bisect--helper: using `--bisect-state` without an argument is a bug\n - bisect--helper: really retire `--bisect-autostart`\n - bisect--helper: really retire --bisect-next-check\n - bisect--helper: retire the --no-log option\n - bisect: avoid double-quoting when printing the failed command\n - bisect run: fix the error message\n\n Final bits of \"git bisect.sh\" have been rewritten in C.\n\n Expecting a reroll.\n cf. <220225.86ilt27uln.gmgdl@evledraar.gmail.com>\n source: \n\n\n* js/scalar-diagnose (2022-02-06) 6 commits\n - scalar: teach `diagnose` to gather loose objects information\n - scalar: teach `diagnose` to gather packfile info\n - scalar diagnose: include disk space information\n - scalar: add `diagnose`\n - scalar: validate the optional enlistment argument\n - archive: optionally add \"virtual\" files\n\n Implementation of \"scalar diagnose\" subcommand.\n\n On hold.\n cf. \n source: \n\n\n* en/merge-tree (2022-02-23) 13 commits\n - git-merge-tree.txt: add a section on potentional usage mistakes\n - merge-tree: add a --allow-unrelated-histories flag\n - merge-tree: allow `ls-files -u` style info to be NUL terminated\n - merge-tree: provide easy access to `ls-files -u` style info\n - merge-tree: provide a list of which files have conflicts\n - merge-ort: provide a merge_get_conflicted_files() helper function\n - merge-tree: support including merge messages in output\n - merge-ort: split out a separate display_update_messages() function\n - merge-tree: implement real merges\n - merge-tree: add option parsing and initial shell for real merge function\n - merge-tree: move logic for existing merge into new function\n - merge-tree: rename merge_trees() to trivial_merge_trees()\n - Merge branch 'en/remerge-diff' into en/merge-trees\n\n A new command is introduced that takes two commits and computes a\n tree that would be contained in the resulting merge commit, if the\n histories leading to these two commits were to be merged, and is\n added as a new mode of \"git merge-tree\" subcommand.\n\n On hold.\n cf. \n source: \n\n\n* jh/p4-various-fixups (2022-02-10) 22 commits\n - git-p4: sort imports\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\n Various cleanups to \"git p4\".\n source: <20220210164627.279520-1-jholdsworth@nvidia.com>\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\n What's the status of the \"known breakage\"?\n Are we ready to switch if we wanted to?\n There are known breakages on macOS.\n cf. \n source: \n\n\n* jh/builtin-fsmonitor-part2 (2022-03-23) 29 commits\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, clarify trivial response handling\n (this branch is used by jh/builtin-fsmonitor-part3.)\n\n Built-in fsmonitor (part 2).\n\n Expecting a roroll that is hopefully the final one.\n cf. \n source: \n\n\n* es/superproject-aware-submodules (2022-03-09) 3 commits\n . rev-parse: short-circuit superproject worktree when config unset\n . introduce submodule.hasSuperproject record\n . t7400-submodule-basic: modernize inspect() helper\n\n A configuration variable in a repository tells if it is (or is not)\n a submodule of a superproject.\n\n Expecting a reroll.\n cf. \n source: <20220310004423.2627181-1-emilyshaffer@google.com>\n\n--------------------------------------------------\n[Discarded]\n\n* jc/parse-options-check (2022-03-01) 1 commit\n . parse-options: make parse_options_check() test-only\n\n Bypass sanity checks on the options array at runtime, and trigger\n them only during the tests.\n source: \n\n\n* jc/merge-continue-doc (2022-02-28) 1 commit\n . merge: 'git merge --continue' is merely 'git commit'\n\n \"git merge\" documentation clarifies that \"git commit\" is sufficient\n to conclude an interrupted merge.\n source: \n"},{"id":"452261","messageId":"220325.86v8w2kurx.gmgdl@evledraar.gmail.com","threadId":"57609","inReplyTo":"xmqqwngkm4am.fsf@gitster.g","subject":"ab/commit-plug-leaks (was: What's cooking in git.git (Mar 2022, #05; Wed, 23))","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2022-03-25T13:38:43Z","receivedAt":"2022-03-25T13:48:41Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Wed, Mar 23 2022, Junio C Hamano wrote:\n\n> * ab/commit-plug-leaks (2022-02-16) 2 commits\n> - commit: use strbuf_release() instead of UNLEAK()\n> - commit: fix \"author_ident\" leak\n>\n> Leakfixes in the top-level called-once function.\n>\n> Expecting a reroll.\n> I think UNLEAK->strbuf_release() is a regression.\n> source: \n\nRe our earlier exchange ending in\nhttps://lore.kernel.org/git/xmqqczjbj0nf.fsf@gitster.g/ I still think it\nmakes sense to get rid of the UNLEAK() there.\n\nOne reason not mentioned there (but which I do find useful) is that if\nwe actually free the memory then you don't need to build with\n-DSUPPRESS_ANNOTATED_LEAKS to suppress these, which is useful e.g. when\nlooking at valgrind output, as opposed to SANITIZE=leak where we do add\n-DSUPPRESS_ANNOTATED_LEAKS.\n\nAnd since I submitted this topic our number of UNLEAK() in builtin/ is\ndown from 29 to 23 with the queued release_revisions() topic.\n\nBut you seem to feel strongly that we should keep these specific\nUNLEAK() for reasons I don't really understand despite re-reading that\nexchange. I.e. the cost of doing the actual release is minuscule, and we\nhave a lot of such strbuf_release() in builtin/*.c already.\n\nBut if you'd just like to drop this topic I understand, but I think it's\nready to advance as is, but either way it's probably good to get it out\nof the current status\n"},{"id":"452412","messageId":"220326.86k0cgk83t.gmgdl@evledraar.gmail.com","threadId":"57609","inReplyTo":"xmqqwngkm4am.fsf@gitster.g","subject":"fr/vimdiff-layout (was: What's cooking in git.git (Mar 2022, #05; Wed, 23))","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2022-03-26T16:05:58Z","receivedAt":"2022-03-26T16:10:36Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Wed, Mar 23 2022, Junio C Hamano wrote:\n\n> * fr/vimdiff-layout (2022-03-23) 3 commits\n> - vimdiff: integrate layout tests in the unit tests framework ('t' folder)\n> - vimdiff: add tool documentation\n> - vimdiff: new implementation with layout support\n>\n> Reimplement \"vimdiff[123]\" mergetool drivers with a more generic\n> layout mechanism.\n>\n> Will merge to 'next'?\n> source: <20220319091141.4911-1-greenfoo@u92.eu>\n\nIt looks like it's emitting a new warning from the \"Makefile\" in\ncheck-docs:\n\t\n\t$ (make clean && make check-docs) >/dev/null 2>&1; make check-docs\n\tmake -C Documentation lint-docs\n\tmake[1]: Entering directory '/home/avar/g/git/Documentation'\n\tmake[1]: Nothing to be done for 'lint-docs'.\n\tmake[1]: Leaving directory '/home/avar/g/git/Documentation'\n\tremoved but documented: git-difftool--vimdiff\n\tremoved but documented: git-mergetool--vimdiff\n\tremoved but documented: git-version\n\nRe https://lore.kernel.org/git/87o88i2keu.fsf@evledraar.gmail.com/ I\nhaven't checked if this is the same case of a thing we should just\nignore, or if it's raising an actual issue this time.\n"},{"id":"452421","messageId":"Yj+Z0T2TShqH99a/@zacax395.localdomain","threadId":"57609","inReplyTo":"220326.86k0cgk83t.gmgdl@evledraar.gmail.com","subject":"Re: fr/vimdiff-layout (was: What's cooking in git.git (Mar 2022, #05; Wed, 23))","fromName":"Fernando Ramos","fromEmail":"greenfoo@u92.eu","sentAt":"2022-03-26T22:55:13Z","receivedAt":"2022-03-26T22:57:18Z","isPatch":false,"sender":{"key":"greenfoo@u92.eu","avatar":"https://avatars.githubusercontent.com/u/42691086?v=4"},"body":"> It looks like it's emitting a new warning from the \"Makefile\" in\n> check-docs:\n> \t\n> \t$ (make clean && make check-docs) >/dev/null 2>&1; make check-docs\n> \tmake -C Documentation lint-docs\n> \tmake[1]: Entering directory '/home/avar/g/git/Documentation'\n> \tmake[1]: Nothing to be done for 'lint-docs'.\n> \tmake[1]: Leaving directory '/home/avar/g/git/Documentation'\n> \tremoved but documented: git-difftool--vimdiff\n> \tremoved but documented: git-mergetool--vimdiff\n> \tremoved but documented: git-version\n\nLooking at how the Makefile works it looks like this error is triggered\nbecause...\n\n 1. I have created these two new files:\n - Documentation/git-difftool--vimdiff.txt\n - Documentation/git-mergetool--vimdiff.txt\n\n 2. None of them are real programs (such as \"git-clone\") or scripts (such as\n \"git-mergetool--lib.sh\")\n\nAll the other \"Documentation/*.txt\" files are associated to \"something\" that\ncan be executed, but not these two (they are only meant to be accessed from \"git\nhelp\" / \"man\").\n\nOptions I can think of:\n\n A) Ignore the warning message\n\n B) Remove these two files and add all this documentation to an already\n existing one (maybe \"Documentation/git-mergetool--lib.txt\")\n\n C) Create a new variable in the Makefile to contain a list of \"documentation\n aliases\" that do not correspond to a \"real\" command, so that they can be\n filtered out when testing for documentation problems.\n\nIn other to implement (C) we could do something like this:\n\n> diff --git a/Makefile b/Makefile\n> index 70f0a004e7..db8a1c8025 100644\n> --- a/Makefile\n> +++ b/Makefile\n> @@ -597,6 +597,7 @@ TEST_BUILTINS_OBJS =\n> TEST_OBJS =\n> TEST_PROGRAMS_NEED_X =\n> THIRD_PARTY_SOURCES =\n> +DOC_ALIASES =\n> \n> # Having this variable in your environment would break pipelines because\n> # you cause \"cd\" to echo its destination to stdout. It can also take\n> @@ -1228,6 +1229,11 @@ THIRD_PARTY_SOURCES += compat/regex/%\n> THIRD_PARTY_SOURCES += sha1collisiondetection/%\n> THIRD_PARTY_SOURCES += sha1dc/%\n> \n> +# DOC ALIASES is a list of topics you can call \"git help\" on but they are no\n> +# real commands or scripts you can execute\n> +DOC_ALIASES += git-difftool--vimdiff\n> +DOC_ALIASES += git-mergetool--vimdiff\n> +\n> # xdiff and reftable libs may in turn depend on what is in libgit.a\n> GITLIBS = common-main.o $(LIB_FILE) $(XDIFF_LIB) $(REFTABLE_LIB) $(LIB_FILE)\n> EXTLIBS =\n> @@ -3355,7 +3361,7 @@ check-docs::\n> -e 's/\\.txt//'; \\\n> ) | while read how cmd; \\\n> do \\\n> - case \" $(patsubst %$X,%,$(ALL_COMMANDS) $(BUILT_INS) $(EXCLUDED_PROGRAMS)) \" in \\\n> + case \" $(patsubst %$X,%,$(ALL_COMMANDS) $(BUILT_INS) $(EXCLUDED_PROGRAMS) $(DOC_ALIASES)) \" in \\\n> *\" $$cmd \"*) ;; \\\n> *) echo \"removed but $$how: $$cmd\" ;; \\\n> esac; \\\n\nLet me know what you think. Thanks!\n\n\n"},{"id":"452422","messageId":"xmqq4k3k6xw3.fsf@gitster.g","threadId":"57609","inReplyTo":"Yj+Z0T2TShqH99a/@zacax395.localdomain","subject":"Re: fr/vimdiff-layout","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-03-27T00:29:32Z","receivedAt":"2022-03-27T00:29:39Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Fernando Ramos writes:\n\n>> It looks like it's emitting a new warning from the \"Makefile\" in\n>> check-docs:\n>> \t\n>> \t$ (make clean && make check-docs) >/dev/null 2>&1; make check-docs\n>> \tmake -C Documentation lint-docs\n>> \tmake[1]: Entering directory '/home/avar/g/git/Documentation'\n>> \tmake[1]: Nothing to be done for 'lint-docs'.\n>> \tmake[1]: Leaving directory '/home/avar/g/git/Documentation'\n>> \tremoved but documented: git-difftool--vimdiff\n>> \tremoved but documented: git-mergetool--vimdiff\n>> \tremoved but documented: git-version\n>\n> Looking at how the Makefile works it looks like this error is triggered\n> because...\n>\n> 1. I have created these two new files:\n> - Documentation/git-difftool--vimdiff.txt\n> - Documentation/git-mergetool--vimdiff.txt\n>\n> 2. None of them are real programs (such as \"git-clone\") or scripts (such as\n> \"git-mergetool--lib.sh\")\n>\n> All the other \"Documentation/*.txt\" files are associated to \"something\" that\n> can be executed, but not these two (they are only meant to be accessed from \"git\n> help\" / \"man\").\n\nThanks for noticing and reporting, Ævar.\n\nI think the right place to describe how vimdiff or other\nconfiguration should be configured should live next to configuration\ndocumentation for other backends.\n\nDocumentation/git-mergetool.txt is the main entry point for those\nwho want to learn about \"git mergetool\", i.e. \"git mergetool --help\"\nshows what's in there.\n\nThe documentation talks about the \"mergetool\" front-end, and then\nincludes config/mergetool.txt for the configuration files.\n\nAfter all, the topic adds only one mergetool..layout\nconfiguration variable. The file config/mergetool.txt would be the\nplace to describe that variable, after the entry for\nmergetool.meld.useAutoMerge, which is already is about a variable\nthat is specific to a particular backend. If we can successfully\ncan go this route, we do not need any new file added at all.\n\nAlternatively, in the longer run, we may want backend specific\ninformation in the \"git mergetool --help\" documentation. Maybe\nvimdiff is the first and currently only such backend that wants\ndocumentation specific to it, but it does not has to stay that way\nforever.\n\nSo adding a new section \"BACKENDS SPECIFIC HINTS\" after \"TEMPORARY\nFILES\" section, and add \"VIMDIFF\" as its first (and currently only)\nsubsection, would be a reasonable thing to do. Create a\nDocumentation/mergetools/ subdirectory, add vimdiff.txt file in\nthere, move the most of what is in git-mergetool--vimdiff.txt, and\ninclude it from Documentation/git-mergetool.txt, perhaps like the\nattached patch outlines?\n\n\n\ndiff --git c/Documentation/config/mergetool.txt w/Documentation/config/mergetool.txt\nindex cafbbef46a..19ca39d43d 100644\n--- c/Documentation/config/mergetool.txt\n+++ w/Documentation/config/mergetool.txt\n@@ -45,6 +45,11 @@ mergetool.meld.useAutoMerge::\n \tvalue of `false` avoids using `--auto-merge` altogether, and is the\n \tdefault value.\n \n+mergetool.vimdiff.layout::\n+\tThe vimdiff backend uses this variable to control how its split\n+\twindows look like. See BACKEND SPECIFIC HINTS section of\n+\tlinkgit:git-mergetool[1] for details.\n+\n mergetool.hideResolved::\n \tDuring a merge Git will automatically resolve as many conflicts as\n \tpossible and write the 'MERGED' file containing conflict markers around\ndiff --git c/Documentation/git-mergetool.txt w/Documentation/git-mergetool.txt\nindex e587c7763a..6cf3734544 100644\n--- c/Documentation/git-mergetool.txt\n+++ w/Documentation/git-mergetool.txt\n@@ -113,6 +113,16 @@ Setting the `mergetool.keepBackup` configuration variable to `false`\n causes `git mergetool` to automatically remove the backup as files\n are successfully merged.\n \n+BACKEND SPECIFIC HINTS\n+----------------------\n+\n+Here we'll give backend specific hints.\n+\n+vimdiff\n+~~~~~~~\n+include::mergetools/vimdiff.txt[]\n+\n+\n GIT\n ---\n Part of the linkgit:git[1] suite\ndiff --git c/Documentation/mergetools/vimdiff.txt w/Documentation/mergetools/vimdiff.txt\nnew file mode 100644\nindex 0000000000..1cac121283\n--- /dev/null\n+++ w/Documentation/mergetools/vimdiff.txt\n@@ -0,0 +1,11 @@\n+vimdiff\n+~~~~~~~\n+\n+Vimdiff backend allows `mergetools.vimdiff.layout` to specify how\n+the split window is used ...\n+\n+Layout\n+^^^^^^\n+\n+Text.\n+\n"},{"id":"452435","messageId":"patch-1.1-4a5d219dfe7-20220327T131751Z-avarab@gmail.com","threadId":"57609","inReplyTo":"xmqq4k3k6xw3.fsf@gitster.g","subject":"[PATCH] tests: do roundtrip builtin doc & sanity checking","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2022-03-27T13:18:20Z","receivedAt":"2022-03-27T13:18:32Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Replace the part of \"make check-docs\" first added in [1] and the\nentirety of \"make check-builtins\" first added in [2] with checks that\ndo checking against --list-cmds=main (see [3]) and that our generated\n\"man\" docs instead.\n\nThe \"check-docs\" part of this was mostly broken anyway, in that we\nwere ignoring the exit code. Since b6d8887d3d6 (documentation: add\ndocumentation for 'git version', 2021-09-14) we started emitting:\n\n\t$ make -s check-docs\n\tremoved but documented: git-version\n\nBut as noted in [4] the check didn't fail.\n\nBy checking that we get the man page when running \"git $cmd --help\" we\ncan be sure that we don't miss anything. To do this add a\nGIT_TEST_MANPATH, as we don't want to append to the manpath as we'd\npick up the MANPATH on the system.\n\nThere is no replacement provided for the \"$base is builtin but\n$builtin.$sfx still exists\" part of the \"check-builtins\" check being\nremoved here. Back when it was added various commands were being\nmigrated to C at a rapid rate, now we have just a few stragglers\nin *.sh and *.perl. It's unlikely that we'd forget to remove the old\ncode.\n\n1. 8c989ec5288 (Makefile: $(MAKE) check-docs, 2006-04-13)\n2. c74390e4a1d (cherry is built-in, do not ship git-cherry.sh,\n 2006-11-05)\n3. 6bb2dc0b947 (completion: implement and use --list-cmds=main,others,\n 2018-05-20)\n4. https://lore.kernel.org/git/87o88i2keu.fsf@evledraar.gmail.com/\n\nSigned-off-by: Ævar Arnfjörð Bjarmason \n---\n Documentation/Makefile | 3 --\n Makefile | 39 +----------------\n builtin/help.c | 12 +++++-\n check-builtins.sh | 34 ---------------\n ci/install-dependencies.sh | 3 ++\n t/t0012-help.sh | 86 +++++++++++++++++++++++++++++++++++++-\n 6 files changed, 101 insertions(+), 76 deletions(-)\n delete mode 100755 check-builtins.sh\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex 1eb9192dae8..a2c6ef479e0 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -431,9 +431,6 @@ require-htmlrepo::\n quick-install-html: require-htmlrepo\n \t'$(SHELL_PATH_SQ)' ./install-doc-quick.sh $(HTML_REPO) $(DESTDIR)$(htmldir) $(GIT_MAN_REF)\n \n-print-man1:\n-\t@for i in $(MAN1_TXT); do echo $$i; done\n-\n ## Lint: gitlink\n LINT_DOCS_GITLINK = $(patsubst %.txt,.build/lint-docs/gitlink/%.ok,$(HOWTO_TXT) $(DOC_DEP_TXT))\n $(LINT_DOCS_GITLINK): lint-gitlink.perl\ndiff --git a/Makefile b/Makefile\nindex e8aba291d7f..c5b83f80a3a 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -3331,46 +3331,11 @@ ALL_COMMANDS += gitweb\n .PHONY: check-docs\n check-docs::\n \t$(MAKE) -C Documentation lint-docs\n-\t@(for v in $(patsubst %$X,%,$(ALL_COMMANDS)); \\\n-\tdo \\\n-\t\tcase \"$$v\" in \\\n-\t\tgit-merge-octopus | git-merge-ours | git-merge-recursive | \\\n-\t\tgit-merge-resolve | git-merge-subtree | \\\n-\t\tgit-fsck-objects | git-init-db | \\\n-\t\tgit-remote-* | git-stage | git-legacy-* | \\\n-\t\tgit-?*--?* ) continue ;; \\\n-\t\tesac ; \\\n-\t\ttest -f \"Documentation/$$v.txt\" || \\\n-\t\techo \"no doc: $$v\"; \\\n-\t\tsed -e '1,/^### command list/d' -e '/^#/d' command-list.txt | \\\n-\t\tgrep -q \"^$$v[ \t]\" || \\\n-\t\tcase \"$$v\" in \\\n-\t\tgit) ;; \\\n-\t\t*) echo \"no link: $$v\";; \\\n-\t\tesac ; \\\n-\tdone; \\\n-\t( \\\n-\t\tsed -e '1,/^### command list/d' \\\n-\t\t -e '/^#/d' \\\n-\t\t -e '/guide$$/d' \\\n-\t\t -e 's/[ \t].*//' \\\n-\t\t -e 's/^/listed /' command-list.txt; \\\n-\t\t$(MAKE) -C Documentation print-man1 | \\\n-\t\tgrep '\\.txt$$' | \\\n-\t\tsed -e 's|^|documented |' \\\n-\t\t -e 's/\\.txt//'; \\\n-\t) | while read how cmd; \\\n-\tdo \\\n-\t\tcase \" $(patsubst %$X,%,$(ALL_COMMANDS) $(BUILT_INS) $(EXCLUDED_PROGRAMS)) \" in \\\n-\t\t*\" $$cmd \"*)\t;; \\\n-\t\t*) echo \"removed but $$how: $$cmd\" ;; \\\n-\t\tesac; \\\n-\tdone ) | sort\n \n ### Make sure built-ins do not have dups and listed in git.c\n #\n-check-builtins::\n-\t./check-builtins.sh\n+check-builtins:: all man\n+\t$(MAKE) -C t T=t0012-help.sh\n \n ### Test suite coverage testing\n #\ndiff --git a/builtin/help.c b/builtin/help.c\nindex 222f994f863..775eee76c05 100644\n--- a/builtin/help.c\n+++ b/builtin/help.c\n@@ -434,7 +434,7 @@ static const char *cmd_to_page(const char *git_cmd)\n \t\treturn xstrfmt(\"git%s\", git_cmd);\n }\n \n-static void setup_man_path(void)\n+static void setup_real_man_path(void)\n {\n \tstruct strbuf new_path = STRBUF_INIT;\n \tconst char *old_path = getenv(\"MANPATH\");\n@@ -455,6 +455,16 @@ static void setup_man_path(void)\n \tstrbuf_release(&new_path);\n }\n \n+static void setup_man_path(void)\n+{\n+\tconst char *test_manpath = getenv(\"GIT_TEST_MANPATH\");\n+\n+\tif (test_manpath)\n+\t\txsetenv(\"MANPATH\", test_manpath, 1);\n+\telse\n+\t\tsetup_real_man_path();\n+}\n+\n static void exec_viewer(const char *name, const char *page)\n {\n \tconst char *info = get_man_viewer_info(name);\ndiff --git a/check-builtins.sh b/check-builtins.sh\ndeleted file mode 100755\nindex a0aaf3a3473..00000000000\n--- a/check-builtins.sh\n+++ /dev/null\n@@ -1,34 +0,0 @@\n-#!/bin/sh\n-\n-{\n-\tcat <<\\EOF\n-sayIt:\n-\t$(foreach b,$(BUILT_INS),echo XXX $(b:$X=) YYY;)\n-EOF\n-\tcat Makefile\n-} |\n-make -f - sayIt 2>/dev/null |\n-sed -n -e 's/.*XXX \\(.*\\) YYY.*/\\1/p' |\n-sort |\n-{\n- bad=0\n- while read builtin\n- do\n-\tbase=$(expr \"$builtin\" : 'git-\\(.*\\)')\n-\tx=$(sed -ne 's/.*{ \"'$base'\", \\(cmd_[^, ]*\\).*/'$base'\t\\1/p' git.c)\n-\tif test -z \"$x\"\n-\tthen\n-\t\techo \"$base is builtin but not listed in git.c command list\"\n-\t\tbad=1\n-\tfi\n-\tfor sfx in sh perl py\n-\tdo\n-\t\tif test -f \"$builtin.$sfx\"\n-\t\tthen\n-\t\t\techo \"$base is builtin but $builtin.$sfx still exists\"\n-\t\t\tbad=1\n-\t\tfi\n-\tdone\n- done\n- exit $bad\n-}\ndiff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh\nindex dbcebad2fb2..1df7c908db0 100755\n--- a/ci/install-dependencies.sh\n+++ b/ci/install-dependencies.sh\n@@ -71,6 +71,9 @@ Documentation)\n \n \ttest -n \"$ALREADY_HAVE_ASCIIDOCTOR\" ||\n \tsudo gem install --version 1.5.8 asciidoctor\n+\n+\tsudo apt-get -q -y install libcurl4-openssl-dev libssl-dev \\\n+\t\tlibexpat-dev gettext make\n \t;;\n linux-gcc-default)\n \tsudo apt-get -q update\ndiff --git a/t/t0012-help.sh b/t/t0012-help.sh\nindex 6c3e1f7159d..522eb1b492d 100755\n--- a/t/t0012-help.sh\n+++ b/t/t0012-help.sh\n@@ -234,7 +234,9 @@ test_expect_success \"'git help -g' section spacing\" '\n \n test_expect_success 'generate builtin list' '\n \tmkdir -p sub &&\n-\tgit --list-cmds=builtins >builtins\n+\tgit --list-cmds=builtins >builtins &&\n+\tuniq builtins >builtins.uniq &&\n+\ttest_cmp builtins builtins.uniq\n '\n \n while read builtin\n@@ -249,4 +251,86 @@ do\n \t'\n done man.txt &&\n+\tgrep GIT-ADD man.txt &&\n+\tgrep ^SYNOPSIS man.txt\n+'\n+\n+is_documented () {\n+\tcat >undocumented <<-\\EOF\n+\tadd--interactive\n+\tbisect--helper\n+\tcheckout--worker\n+\tdifftool--helper\n+\tenv--helper\n+\tmerge-octopus\n+\tmerge-ours\n+\tmerge-recursive\n+\tmerge-recursive-ours\n+\tmerge-recursive-theirs\n+\tmerge-resolve\n+\tmerge-subtree\n+\tpickaxe\n+\tremote-ftp\n+\tremote-ftps\n+\tremote-http\n+\tremote-https\n+\tsubmodule--helper\n+\tupload-archive--writer\n+\tEOF\n+\t! grep -q \"^$1$\" undocumented\n+}\n+\n+test_undocumented () {\n+\tcmd=$1 &&\n+\ttest_expect_success HAVE_BUILT_DOCS \"$cmd does not have --help documentation\" '\n+\t\tsymlink_test_manpath &&\n+\t\ttest_when_finished \"rm -f man.txt\" &&\n+\t\ttest_must_fail env GIT_TEST_MANPATH=\"$PWD\" git $cmd --help >man.txt\n+\t'\n+}\n+\n+test_documented () {\n+\tcmd=$1 &&\n+\ttest_expect_success HAVE_BUILT_DOCS \"$cmd can handle --help\" '\n+\t\tsymlink_test_manpath &&\n+\t\ttest_when_finished \"rm -f man.txt\" &&\n+\t\tGIT_TEST_MANPATH=\"$PWD\" git $cmd --help >man.txt &&\n+\t\tgrep \"git-$cmd\" man.txt\n+\t'\n+}\n+\n+test_expect_success 'generate main list' '\n+\tmkdir -p sub &&\n+\tgit --list-cmds=main >main\n+'\n+\n+while read cmd\n+do\n+\tcase \"$cmd\" in\n+\t*.sh|*.perl|*.py)\n+\t\t continue\n+\t\t ;;\n+\tesac &&\n+\tif is_documented \"$cmd\"\n+\tthen\n+\t\ttest_documented \"$cmd\"\n+\telse\n+\t\ttest_undocumented \"$cmd\"\n+\tfi\n+done