Here are the topics that have been cooking in my tree. Commits prefixed with '+' are in 'next' (being in 'next' is a sign that a topic is stable enough to be used and are candidate to be in a future release). Commits prefixed with '-' are only in 'seen', which means nothing more than that I have found them of interest for some reason (like "it may have hard-to-resolve conflicts with another topic already in flight" or "this may turn out to be useful"). Do not read too much into a topic being in (or not in) 'seen'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. The fourteenth batch of topics are in 'master'. It has only been just a few days since the last batch, but I'd be offline tomorrow (a forced day-off), so I'm merging them a bit earlier. I expect that things will start to calm down in preparation for the release expected in mid November. Topics that are not marked with any plans may be in that status because they didn't get much attention by reviewers, in which case you folks know what to do ;-) Copies of the source code to Git live in many repositories, and the following is a list of the ones I push into or their mirrors. Some repositories have only a subset of branches. With maint, master, next, seen, todo: git://git.kernel.org/pub/scm/git/git.git/ git://repo.or.cz/alt-git.git/ https://kernel.googlesource.com/pub/scm/git/git/ https://github.com/git/git/ https://gitlab.com/git-vcs/git/ With all the integration branches and topics broken out: https://github.com/gitster/git/ Even though the preformatted documentation in HTML and man format are not sources, they are published in these repositories for convenience (replace "htmldocs" with "manpages" for the manual pages): git://git.kernel.org/pub/scm/git/git-htmldocs.git/ https://github.com/gitster/git-htmldocs.git/ Release tarballs are available at: https://www.kernel.org/pub/software/scm/git/ -------------------------------------------------- [Graduated to 'master'] * ab/align-parse-options-help (2021-09-22) 4 commits (merged to 'next' on 2021-10-06 at e22da7ef85) + parse-options: properly align continued usage output + git rev-parse --parseopt tests: add more usagestr tests + send-pack: properly use parse_options() API for usage string + parse-options API users: align usage output in C-strings When "git cmd -h" shows more than one line of usage text (e.g. the cmd subcommand may take sub-sub-command), parse-options API learned to align these lines, even across i18n/l10n. * ab/config-based-hooks-1 (2021-09-27) 8 commits (merged to 'next' on 2021-10-06 at d05325ed35) + hook-list.h: add a generated list of hooks, like config-list.h + hook.c users: use "hook_exists()" instead of "find_hook()" + hook.c: add a hook_exists() wrapper and use it in bugreport.c + hook.[ch]: move find_hook() from run-command.c to hook.c + Makefile: remove an out-of-date comment + Makefile: don't perform "mv $@+ $@" dance for $(GENERATED_H) + Makefile: stop hardcoding {command,config}-list.h + Makefile: mark "check" target as .PHONY (this branch is used by ab/config-based-hooks-2.) Mostly preliminary clean-up in the hook API. * ab/designated-initializers-more (2021-10-01) 6 commits (merged to 'next' on 2021-10-11 at 9b9836c3df) + builtin/remote.c: add and use SHOW_INFO_INIT + builtin/remote.c: add and use a REF_STATES_INIT + urlmatch.[ch]: add and use URLMATCH_CONFIG_INIT + builtin/blame.c: refactor commit_info_init() to COMMIT_INFO_INIT macro + daemon.c: refactor hostinfo_init() to HOSTINFO_INIT macro + Merge branch 'ab/designated-initializers' into ab/designated-initializers-more Code clean-up. * ab/help-config-vars (2021-09-23) 9 commits (merged to 'next' on 2021-10-06 at bf9538cfbd) + help: move column config discovery to help.c library + help / completion: make "git help" do the hard work + help tests: test --config-for-completion option & output + help: simplify by moving to OPT_CMDMODE() + help: correct logic error in combining --all and --guides + help: correct logic error in combining --all and --config + help tests: add test for --config output + help: correct usage & behavior of "git help --guides" + help: correct the usage string in -h and documentation Teach "git help -c" into helping the command line completion of configuration variables. * ab/lib-subtest (2021-09-22) 9 commits (merged to 'next' on 2021-10-06 at e8fa261811) + test-lib tests: get rid of copy/pasted mock test code + test-lib tests: assert 1 exit code, not non-zero + test-lib tests: refactor common part of check_sub_test_lib_test*() + test-lib tests: avoid subshell for "test_cmp" for readability + test-lib tests: don't provide a description for the sub-tests + test-lib tests: split up "write and run" into two functions + test-lib tests: move "run_sub_test" to a new lib-subtest.sh + Merge branch 'ps/t0000-output-directory-fix' into ab/lib-subtest + Merge branch 'jk/t0000-subtests-fix' into ab/lib-subtest Updates to the tests in t0000 to test the test framework. * ab/make-sparse-for-real (2021-09-22) 1 commit (merged to 'next' on 2021-10-06 at 10e3c31d6a) + Makefile: make the "sparse" target non-.PHONY Prevent "make sparse" from running for the source files that haven't been modified. * bs/doc-blame-color-lines (2021-10-08) 2 commits (merged to 'next' on 2021-10-11 at a2cb7768b6) + blame: document --color-* options + blame: describe default output format The "--color-lines" and "--color-by-age" options of "git blame" have been missing, which are now documented. * cm/save-restore-terminal (2021-10-06) 2 commits (merged to 'next' on 2021-10-11 at 962bb3e75b) + editor: save and reset terminal after calling EDITOR + terminal: teach git how to save/restore its terminal settings An editor session launched during a Git operation (e.g. during 'git commit') can leave the terminal in a funny state. The code path has updated to save the terminal state before, and restore it after, it spawns an editor. * ds/add-rm-with-sparse-index (2021-09-28) 13 commits (merged to 'next' on 2021-10-06 at 80a9cda797) + advice: update message to suggest '--sparse' + mv: refuse to move sparse paths + rm: skip sparse paths with missing SKIP_WORKTREE + rm: add --sparse option + add: update --renormalize to skip sparse paths + add: update --chmod to skip sparse paths + add: implement the --sparse option + add: skip tracked paths outside sparse-checkout cone + add: fail when adding an untracked sparse file + dir: fix pattern matching on dirs + dir: select directories correctly + t1092: behavior for adding sparse files + t3705: test that 'sparse_entry' is unstaged "git add", "git mv", and "git rm" have been adjusted to avoid updating paths outside of the sparse-checkout definition unless the user specifies a "--sparse" option. * en/removing-untracked-fixes (2021-09-27) 12 commits (merged to 'next' on 2021-10-06 at fc4e387fda) + Documentation: call out commands that nuke untracked files/directories + Comment important codepaths regarding nuking untracked files/dirs + unpack-trees: avoid nuking untracked dir in way of locally deleted file + unpack-trees: avoid nuking untracked dir in way of unmerged file + Change unpack_trees' 'reset' flag into an enum + Remove ignored files by default when they are in the way + unpack-trees: make dir an internal-only struct + unpack-trees: introduce preserve_ignored to unpack_trees_options + read-tree, merge-recursive: overwrite ignored files by default + checkout, read-tree: fix leak of unpack_trees_options.dir + t2500: add various tests for nuking untracked files + Merge branch 'en/am-abort-fix' into en/removing-untracked-fixes Various fixes in code paths that move untracked files away to make room. * ja/doc-status-types-and-copies (2021-10-04) 4 commits (merged to 'next' on 2021-10-06 at 4de6571bf7) + Documentation/git-status: mention how to detect copies + Documentation/git-status: document porcelain status T (typechange) + Documentation/diff-format: state in which cases porcelain status is T + Documentation/git-status: remove impossible porcelain status DR and DC A few kinds of changes "git status" can show were not documented. * jh/builtin-fsmonitor-part1 (2021-09-20) 7 commits (merged to 'next' on 2021-10-06 at 021f633b9c) + t/helper/simple-ipc: convert test-simple-ipc to use start_bg_command + run-command: create start_bg_command + simple-ipc/ipc-win32: add Windows ACL to named pipe + simple-ipc/ipc-win32: add trace2 debugging + simple-ipc: move definition of ipc_active_state outside of ifdef + simple-ipc: preparations for supporting binary messages. + trace2: add trace2_child_ready() to report on background children Built-in fsmonitor (part 1). * jk/cat-file-batch-all-wo-replace (2021-10-08) 5 commits (merged to 'next' on 2021-10-11 at 9415f7c43a) + cat-file: use packed_object_info() for --batch-all-objects + cat-file: split ordered/unordered batch-all-objects callbacks + cat-file: disable refs/replace with --batch-all-objects + cat-file: mention --unordered along with --batch-all-objects + t1006: clean up broken objects "git cat-file --batch" with the "--batch-all-objects" option is supposed to iterate over all the objects found in a repository, but it used to translate these object names using the replace mechanism, which defeats the point of enumerating all objects in the repository. This has been corrected. * js/retire-preserve-merges (2021-09-07) 11 commits (merged to 'next' on 2021-09-10 at f645ffd7a3) + sequencer: restrict scope of a formerly public function + rebase: remove a no-longer-used function + rebase: stop mentioning the -p option in comments + rebase: remove obsolete code comment + rebase: drop the internal `rebase--interactive` command + git-svn: drop support for `--preserve-merges` + rebase: drop support for `--preserve-merges` + pull: remove support for `--rebase=preserve` + tests: stop testing `git rebase --preserve-merges` + remote: warn about unhandled branch.<name>.rebase values + t5520: do not use `pull.rebase=preserve` The "--preserve-merges" option of "git rebase" has been removed. * js/windows-ci-path-fix (2021-10-13) 1 commit (merged to 'next' on 2021-10-14 at 3047fe56fc) + ci(windows): ensure that we do not pick up random executables The PATH used in CI job may be too wide and let incompatible dlls to be grabbed, which can cause the build&test to fail. Tighten it. * mt/grep-submodule-textconv (2021-09-29) 1 commit (merged to 'next' on 2021-10-06 at 1950944b8c) + grep: demonstrate bug with textconv attributes and submodules "git grep --recurse-submodules" takes trees and blobs from the submodule repository, but the textconv settings when processing a blob from the submodule is not taken from the submodule repository. A test is added to demonstrate the issue, without fixing it. * rs/make-verify-path-really-verify-again (2021-10-07) 3 commits (merged to 'next' on 2021-10-11 at 6b4358876f) + read-cache: let verify_path() reject trailing dir separators again + read-cache: add verify_path_internal() + t3905: show failure to ignore sub-repo Recent sparse-index work broke safety against attempts to add paths with trailing slashes to the index, which has been corrected. * rs/mergesort (2021-10-08) 10 commits (merged to 'next' on 2021-10-08 at 2e83706316) + test-mergesort: use repeatable random numbers (merged to 'next' on 2021-10-03 at 29a672574f) + mergesort: use ranks stack + p0071: test performance of llist_mergesort() + p0071: measure sorting of already sorted and reversed files + test-mergesort: add unriffle_skewed mode + test-mergesort: add unriffle mode + test-mergesort: add generate subcommand + test-mergesort: add test subcommand + test-mergesort: add sort subcommand + test-mergesort: use strbuf_getline() The mergesort implementation used to sort linked list has been optimized. * tb/repack-write-midx (2021-10-07) 10 commits (merged to 'next' on 2021-10-08 at ff8fec247e) + test-read-midx: fix leak of bitmap_index struct (merged to 'next' on 2021-10-06 at ccdd5aaf2a) + builtin/repack.c: pass `--refs-snapshot` when writing bitmaps + builtin/repack.c: make largest pack preferred + builtin/repack.c: support writing a MIDX while repacking + builtin/repack.c: extract showing progress to a variable + builtin/repack.c: rename variables that deal with non-kept packs + builtin/repack.c: keep track of existing packs unconditionally + midx: preliminary support for `--refs-snapshot` + builtin/multi-pack-index.c: support `--stdin-packs` mode + midx: expose `write_midx_file_only()` publicly (this branch is used by tb/fix-midx-rename-while-mapped.) "git repack" has been taught to generate multi-pack reachability bitmaps. * tz/doc-link-to-bundle-format-fix (2021-10-13) 1 commit (merged to 'next' on 2021-10-14 at dee8053d49) + doc: add bundle-format to TECH_DOCS Doc update. -------------------------------------------------- [New Topics] * ab/fix-commit-error-message-upon-unwritable-object-store (2021-10-12) 2 commits (merged to 'next' on 2021-10-14 at 08c52f5cd5) + commit: fix duplication regression in permission error output + unwritable tests: assert exact error output "git commit" gave duplicated error message when the object store was unwritable, which has been corrected. Will merge to 'master'. * rs/disable-gc-during-perf-tests (2021-10-11) 1 commit (merged to 'next' on 2021-10-14 at e0dd4b9bd4) + perf: disable automatic housekeeping Avoid performance measurements from getting ruined by gc and other housekeeping pauses interfering in the middle. Will merge to 'master'. * gc/remote-with-fewer-static-global-variables (2021-10-13) 3 commits - remote: add struct repository parameter to external functions - remote: use remote_state parameter internally - remote: move static variables into per-repository struct Code clean-up to eventually allow information on remotes defined for an arbitrary repository to be read. Will merge to 'next'? * jk/loosen-urlmatch (2021-10-12) 1 commit - urlmatch: add underscore to URL_HOST_CHARS Treat "_" as any other DNS-valid characters in an URL when matching the per-URL configuration variable names. Will merge to 'next'? * rs/add-dry-run-without-objects (2021-10-12) 1 commit (merged to 'next' on 2021-10-14 at a42928e134) + add: don't write objects with --dry-run Stop "git add --dry-run" from creating new blob and tree objects. Will merge to 'master'. * ab/test-bail (2021-10-14) 2 commits - test-lib.sh: use "Bail out!" syntax on bad SANITIZE=leak use - test-lib.sh: de-duplicate error() teardown code A new feature has been added to abort early in the test framework. Will merge to 'next'. * ab/config-based-hooks-2 (2021-10-15) 14 commits - run-command: remove old run_hook_{le,ve}() hook API - receive-pack: convert push-to-checkout hook to hook.h - read-cache: convert post-index-change to use hook.h - commit: convert {pre-commit,prepare-commit-msg} hook to hook.h - git-p4: use 'git hook' to run hooks - send-email: use 'git hook run' for 'sendemail-validate' - git hook run: add an --ignore-missing flag - merge: convert post-merge to use hook.h - hooks: convert 'post-checkout' hook to hook library - am: convert applypatch to use hook.h - rebase: convert pre-rebase to use hook.h - gc: use hook library for pre-auto-gc hook - hook: add 'run' subcommand - Merge branch 'ab/config-based-hooks-1' into ab/config-based-hooks-2 More "config-based hooks". Breaks t2400. * ab/fix-make-lint-docs (2021-10-15) 4 commits (merged to 'next' on 2021-10-18 at 22ebb3213f) + doc lint: make "lint-docs" non-.PHONY + doc build: speed up "make lint-docs" + doc lint: emit errors on STDERR + doc lint: fix error-hiding regression Build fix. Will merge to 'master'. * ab/ignore-replace-while-working-on-commit-graph (2021-10-15) 3 commits - commit-graph: don't consider "replace" objects with "verify" - commit-graph tests: fix another graph_git_two_modes() helper - commit-graph tests: fix error-hiding graph_git_two_modes() helper (this branch is used by gc/use-repo-settings.) Teach "git commit-graph" command not to allow using replace objects at all, as we do not use the commit-graph at runtime when we see object replacement. Will merge to 'next'? * ab/pkt-line-cleanup (2021-10-15) 2 commits (merged to 'next' on 2021-10-18 at 79b07663da) + pkt-line.[ch]: remove unused packet_read_line_buf() + pkt-line.[ch]: remove unused packet_buf_write_len() Code clean-up. Will merge to 'master'. * ab/test-lib-diff-cleanup (2021-10-15) 2 commits (merged to 'next' on 2021-10-18 at 5229c5d01d) + tests: stop using top-level "README" and "COPYING" files + "lib-diff" tests: make "README" and "COPYING" test data smaller Test clean-up. Will merge to 'master'. * so/stash-staged (2021-10-18) 1 commit - stash: implement '--staged' option for 'push' and 'save' "git stash" learned the "--staged" option to stash away what has been added to the index (and nothing else). Will merge to 'next'? * tb/fix-midx-rename-while-mapped (2021-10-15) 5 commits (merged to 'next' on 2021-10-18 at 52e552caae) + midx.c: guard against commit_lock_file() failures + midx.c: lookup MIDX by object directory during repack + midx.c: lookup MIDX by object directory during expire + midx.c: extract MIDX lookup by object_dir + Merge branch 'tb/repack-write-midx' into tb/fix-midx-rename-while-mapped The codepath to write a new version of .midx multi-pack index files has learned to release the mmaped memory holding the current version of .midx before removing them from the disk, as some platforms do not allow removal of a file that still has mapping. Will merge to 'master'. * vd/sparse-sparsity-fix-on-read (2021-10-15) 2 commits - sparse-index: update index read to consider index.sparse config - test-read-cache.c: prepare_repo_settings after config init Ensure that the sparseness of the in-core index matches the index.sparse configuration specified by the repository immediately after the on-disk index file is read. Under discussion. * jc/fix-ref-sorting-parse (2021-10-18) 1 commit - for-each-ref: delay parsing of --sort=<atom> options Things like "git -c branch.sort=bogus branch new HEAD", i.e. the operation modes of the "git branch" command that do not need the sort key information, no longer errors out by seeing a bogus sort key. Will merge to 'next'? * jc/tutorial-format-patch-base (2021-10-18) 1 commit - MyFirstContribution: teach to use "format-patch --base=auto" Teach and encourage first-time contributors to this project to state the base commit when they submit their topic. * jk/http-push-status-fix (2021-10-18) 2 commits - transport-helper: recognize "expecting report" error from send-pack - send-pack: complain about "expecting report" with --helper-status "git push" client talking to an HTTP server did not diagnose the lack of the final status report from the other side correctly, which has been corrected. Will merge to 'next'. * js/branch-track-inherit (2021-10-18) 1 commit - branch: add flags and config to inherit tracking "git -c branch.autosetupmerge=inherit branch new old" makes "new" to have the same upstream as the "old" branch, instead of marking "old" itself as its upstream. Under discussion. cf. <87a6j6tbsv.fsf@xxxxxxxxxxxxxxx> -------------------------------------------------- [Stalled] * ar/submodule-update (2021-10-13) 9 commits . submodule--helper: rename helper functions . submodule--helper: remove unused helpers . submodule: move core cmd_update() logic to C . submodule--helper: run update using child process struct . submodule--helper: allow setting superprefix for init_submodule() . submodule--helper: refactor get_submodule_displaypath() . submodule--helper: rename helpers for update-clone . submodule--helper: get remote names from any repository . submodule--helper: split up ensure_core_worktree() Rewrite of "git submodule update" in C. Kicked out of 'seen' to make room for es/superproject-aware-submodules which is among the topics this topic stomps on. * pw/diff-color-moved-fix (2021-08-05) 13 commits - diff: drop unused options parameter from cmp_in_block_with_wsd() - diff --color-moved: intern strings - diff: use designated initializers for emitted_diff_symbol - diff --color-moved-ws=allow-indentation-change: improve hash lookups - diff --color-moved: stop clearing potential moved blocks - diff --color-moved: shrink potential moved blocks as we go - diff --color-moved: unify moved block growth functions - diff --color-moved: call comparison function directly - diff --color-moved-ws=allow-indentation-change: simplify and optimize - diff: simplify allow-indentation-change delta calculation - diff --color-moved: avoid false short line matches and bad zerba coloring - diff --color-moved=zebra: fix alternate coloring - diff --color-moved: add perf tests Originally merged to 'next' on 2021-08-05 Long-overdue correctness and performance update to "diff --color-moved" feature. Expecting a reroll. cf. <8bec1a6d-5052-50c3-4100-e6348289d581@xxxxxxxxx> * cf/fetch-set-upstream-while-detached (2021-07-06) 1 commit - fetch: fix segfault on --set-upstream while on a detached HEAD "git fetch --set-upstream" while on detached HEAD segfaulted instead of noticing that such an operation did not make sense. Expecting a reroll. cf. <xmqqsg0ri5mq.fsf@gitster.g> -------------------------------------------------- [Cooking] * ab/test-cleanly-recreate-trash-directory (2021-10-15) 1 commit (merged to 'next' on 2021-10-18 at 6fdb43973b) + test-lib.sh: try to re-chmod & retry on failed trash removal Improve test framework around unwritable directories. Will merge to 'master'. * da/mergetools-special-case-xxdiff-exit-128 (2021-10-13) 1 commit (merged to 'next' on 2021-10-18 at 0dd8a08c63) + mergetools/xxdiff: prevent segfaults from stopping difftool The xxdiff difftool backend can exit with status 128, which the difftool-helper that launches the backend takes as a significant failure, when it is not significant at all. Work it around. Will merge to 'master'. * fs/ssh-signing-fix (2021-10-18) 5 commits (merged to 'next' on 2021-10-18 at 5ffa706433) + gpg-interface: fix leak of strbufs in get_ssh_key_fingerprint() + gpg-interface: fix leak of "line" in parse_ssh_output() (merged to 'next' on 2021-10-14 at 97735c6091) + ssh signing: clarify trustlevel usage in docs + ssh signing: fmt-merge-msg tests & config parse + Merge branch 'fs/ssh-signing' into fs/ssh-signing-fix (this branch uses fs/ssh-signing.) Fix-up for the other topic already in 'next'. Will merge to 'master'. * jc/doc-commit-header-continuation-line (2021-10-12) 1 commit (merged to 'next' on 2021-10-18 at 99b71c0aaf) + signature-format.txt: explain and illustrate multi-line headers Doc update. Will merge to 'master'. cf. <87sfx1hnp4.fsf@xxxxxxxxxxxxxxxxxxxxxxxx> * rb/doc-commit-header-continuation-line (2021-10-11) 1 commit - signature-format.txt: add space to fix gpgsig continuation line Values in the header portion of commit object can be multi-lined by a single SP indentation of the second and subsequent lines, and this applies to an empty line as well. Update an example in the technical documentation to highlight it. Will discard. Superseded by the jc/doc-commit-header-continuation-line topic. * jh/builtin-fsmonitor-part2 (2021-10-14) 5 commits - fsmonitor: update fsmonitor config documentation - fsmonitor: use IPC to query the builtin FSMonitor daemon - fsmonitor: config settings are repository-specific - fsmonitor-ipc: create client routines for git-fsmonitor--daemon - fsmonitor: enhance existing comments Built-in fsmonitor (part 2). Breaks check-docs lint. * ld/sparse-diff-blame (2021-10-15) 3 commits - blame: enable and test the sparse index - diff: enable and test the sparse index - Merge branch 'vd/sparse-reset' into ld/sparse-diff-blame (this branch uses vd/sparse-reset.) Teach diff and blame to work well with sparse index. * ab/mark-leak-free-tests (2021-10-12) 10 commits (merged to 'next' on 2021-10-18 at c522807d5d) + leak tests: mark some misc tests as passing with SANITIZE=leak + leak tests: mark various "generic" tests as passing with SANITIZE=leak + leak tests: mark some read-tree tests as passing with SANITIZE=leak + leak tests: mark some ls-files tests as passing with SANITIZE=leak + leak tests: mark all checkout-index tests as passing with SANITIZE=leak + leak tests: mark all trace2 tests as passing with SANITIZE=leak + leak tests: mark all ls-tree tests as passing with SANITIZE=leak + leak tests: run various "test-tool" tests in t00*.sh SANITIZE=leak + leak tests: run various built-in tests in t00*.sh SANITIZE=leak + Merge branch 'ab/sanitize-leak-ci' into ab/mark-leak-free-tests Bunch of tests are marked as "passing leak check". Will merge to 'master'. * ab/mark-leak-free-tests-more (2021-10-07) 8 commits (merged to 'next' on 2021-10-18 at fe798f77b8) + merge: add missing strbuf_release() + ls-files: add missing string_list_clear() + ls-files: fix a trivial dir_clear() leak + tests: fix test-oid-array leak, test in SANITIZE=leak + tests: fix a memory leak in test-oidtree.c + tests: fix a memory leak in test-parse-options.c + tests: fix a memory leak in test-prio-queue.c + Merge branch 'ab/sanitize-leak-ci' into ab/mark-leak-free-tests-more Bunch of tests are marked as "passing leak check". Will merge to 'master'. * ab/unpack-trees-leakfix (2021-10-13) 4 commits (merged to 'next' on 2021-10-14 at bb54827704) + sequencer: fix a memory leak in do_reset() + sequencer: add a "goto cleanup" to do_reset() + unpack-trees: don't leak memory in verify_clean_subdirectory() + Merge branch 'ab/sanitize-leak-ci' into ab/unpack-trees-leakfix Leakfix. Will merge to 'master'. * js/userdiff-cpp (2021-10-10) 6 commits (merged to 'next' on 2021-10-18 at fea77f6c4e) + userdiff-cpp: learn the C++ spaceship operator + userdiff-cpp: permit the digit-separating single-quote in numbers + userdiff-cpp: prepare test cases with yet unsupported features + userdiff-cpp: tighten word regex + t4034: add tests showing problematic cpp tokenizations + t4034/cpp: actually test that operator tokens are not split Userdiff patterns for the C++ language has been updated. Will merge to 'master'. * mp/absorb-submodule-git-dir-upon-deinit (2021-10-07) 1 commit - submodule: absorb git dir instead of dying on deinit "git submodule deinit" for a submodule whose .git metadata directory is embedded in its working tree refused to work, until the submodule gets converted to use the "absorbed" form where the metadata directory is stored in superproject, and a gitfile at the top-level of the working tree of the submodule points at it. The command is taught to convert such submodules to the absorbed form as needed. Under review. cf. <xmqqwnmopqqk.fsf@gitster.g> * ns/remerge-diff (2021-10-08) 8 commits - doc/diff-options: explain the new --remerge-diff option - show, log: adapt Elijah Newren's changes to common tmp-objdir API - show, log: provide a --remerge-diff capability - merge-ort: capture and print ll-merge warnings in our preferred fashion - ll-merge: add API for capturing warnings in a strbuf instead of stderr - merge-ort: add ability to record conflict messages in a file - merge-ort: mark a few more conflict messages as omittable - Merge branch 'ns/tmp-objdir' into ns/remerge-diff (this branch uses ns/tmp-objdir.) A new presentation for two-parent merge "--remerge-diff" can be used to show the difference between mechanical (and possibly conflicted) merge results and the recorded resolution. On hold. This is Elijah's remerge-diff rebased on ns/tmp-objdir to share the "create objects temporarily, only to discard without committing them to longer-term storage" infrastructure with another topic. * ns/tmp-objdir (2021-10-04) 2 commits - tmp-objdir: disable ref updates when replacing the primary odb - tmp-objdir: new API for creating temporary writable databases (this branch is used by ns/batched-fsync and ns/remerge-diff.) New interface into the tmp-objdir API to help in-core use of the quarantine feature. Will merge to 'next'. * pw/sparse-cache-tree-verify-fix (2021-10-18) 2 commits (merged to 'next' on 2021-10-18 at 0186a643cc) + t1092: run "rebase --apply" without "-q" in testing (merged to 'next' on 2021-10-11 at 2f90c87850) + sparse index: fix use-after-free bug in cache_tree_verify() Recent sparse-index addition, namely any use of index_name_pos(), can expand sparse index entries and breaks any code that walks cache-tree or existing index entries. One such instance of such a breakage has been corrected. Will merge to 'master'. * vd/sparse-reset (2021-10-11) 8 commits - unpack-trees: improve performance of next_cache_entry - reset: make --mixed sparse-aware - reset: make sparse-aware (except --mixed) - reset: integrate with sparse index - reset: expand test coverage for sparse checkouts - sparse-index: update command for expand/collapse test - reset: preserve skip-worktree bit in mixed reset - reset: rename is_missing to !is_in_reset_tree (this branch is used by ld/sparse-diff-blame.) Various operating modes of "git reset" have been made to work better with the sparse index. Needs review. * gc/use-repo-settings (2021-10-15) 4 commits - gc: perform incremental repack when implictly enabled - fsck: verify multi-pack-index when implictly enabled - fsck: verify commit graph when implicitly enabled - Merge branch 'ab/ignore-replace-while-working-on-commit-graph' into gc/use-repo-settings (this branch uses ab/ignore-replace-while-working-on-commit-graph.) It is wrong to read some settings directly from the config subsystem, as things like feature.experimental can affect their default values. Will merge to 'next'? * jh/perf-remove-test-times (2021-10-04) 1 commit (merged to 'next' on 2021-10-14 at 473a26166c) + t/perf/perf-lib.sh: remove test_times.* at the end test_perf_() Perf test fix. Will merge to 'master'. * pw/fix-some-issues-in-reset-head (2021-10-01) 12 commits - rebase -m: don't fork git checkout - rebase --apply: set ORIG_HEAD correctly - rebase --apply: fix reflog - reset_head(): take struct rebase_head_opts - rebase: cleanup reset_head() calls - reset_head(): make default_reflog_action optional - reset_head(): factor out ref updates - reset_head(): remove action parameter - reset_head(): don't run checkout hook if there is an error - reset_head(): fix checkout - rebase: factor out checkout for up to date branch - Merge branch 'pw/rebase-of-a-tag-fix' into pw/fix-some-issues-in-reset-head Fix "some issues" in a helper function reset_head(). Expecting a reroll. Needs a lot better explanation, including what the issues are, which codepaths the helper is used and to do what, and tests to protect the fixes. * ab/parse-options-cleanup (2021-10-08) 10 commits (merged to 'next' on 2021-10-18 at 305d339ad9) + parse-options: change OPT_{SHORT,UNSET} to an enum + parse-options tests: test optname() output + parse-options.[ch]: make opt{bug,name}() "static" + commit-graph: stop using optname() + parse-options.c: move optname() earlier in the file + parse-options.h: make the "flags" in "struct option" an enum + parse-options.c: use exhaustive "case" arms for "enum parse_opt_result" + parse-options.[ch]: consistently use "enum parse_opt_result" + parse-options.[ch]: consistently use "enum parse_opt_flags" + parse-options.h: move PARSE_OPT_SHELL_EVAL between enums Random changes to parse-options implementation. Will merge to 'master'. * es/superproject-aware-submodules (2021-10-14) 4 commits - submodule: record superproject gitdir during 'update' - submodule: record superproject gitdir during absorbgitdirs - introduce submodule.superprojectGitDir record - t7400-submodule-basic: modernize inspect() helper A configuration variable in a submodule points at the location of the superproject it is bound to (RFC). Will merge to 'next'? * ab/fsck-unexpected-type (2021-10-01) 17 commits (merged to 'next' on 2021-10-14 at 10edc78c9c) + fsck: report invalid object type-path combinations + fsck: don't hard die on invalid object types + object-file.c: stop dying in parse_loose_header() + object-file.c: return ULHR_TOO_LONG on "header too long" + object-file.c: use "enum" return type for unpack_loose_header() + object-file.c: simplify unpack_loose_short_header() + object-file.c: make parse_loose_header_extended() public + object-file.c: return -1, not "status" from unpack_loose_header() + object-file.c: don't set "typep" when returning non-zero + cat-file tests: test for current --allow-unknown-type behavior + cat-file tests: add corrupt loose object test + cat-file tests: test for missing/bogus object with -t, -s and -p + cat-file tests: move bogus_* variable declarations earlier + fsck tests: test for garbage appended to a loose object + fsck tests: test current hash/type mismatch behavior + fsck tests: refactor one test to use a sub-repo + fsck tests: add test for fsck-ing an unknown type "git fsck" has been taught to report mismatch between expected and actual types of an object better. Will merge to 'master'. * jt/no-abuse-alternate-odb-for-submodules (2021-10-08) 9 commits (merged to 'next' on 2021-10-14 at ae49a2ceda) + submodule: trace adding submodule ODB as alternate + submodule: pass repo to check_has_commit() + object-file: only register submodule ODB if needed + merge-{ort,recursive}: remove add_submodule_odb() + refs: peeling non-the_repository iterators is BUG + refs: teach arbitrary repo support to iterators + refs: plumb repo into ref stores + Merge branch 'jk/ref-paranoia' into jt/no-abuse-alternate-odb-for-submodules + Merge branch 'jt/add-submodule-odb-clean-up' into jt/no-abuse-alternate-odb-for-submodules Follow through the work to use the repo interface to access submodule objects in-process, instead of abusing the alternate object database interface. Will merge to 'master'. * tp/send-email-completion (2021-10-07) 3 commits - send-email docs: add format-patch options - send-email: programmatically generate bash completions - send-email: terminate --git-completion-helper with LF The command line complation for "git send-email" options have been tweaked to make it easier to keep it in sync with the command itself. Expecting a reroll. cf. <87fst7lkjx.fsf@xxxxxxxxxxxxxxxxxxx> * hm/paint-hits-in-log-grep (2021-10-15) 4 commits - grep/pcre2: fix an edge case concerning ascii patterns and UTF-8 data - pretty: colorize pattern matches in commit messages - grep: refactor next_match() and match_one_pattern() for external use - Merge branch 'jk/grep-haystack-is-read-only' into hm/paint-hits-in-log-grep "git log --grep=string --author=name" learns to highlight hits just like "git grep string" does. Will merge to 'next'? cf. <xmqq1r4vjji3.fsf@gitster.g> * ks/submodule-add-message-fix (2021-09-20) 1 commit - submodule--helper: fix incorrect newlines in an error message Message regression fix. Waiting for a response. cf. <m27df9lvm1.fsf@xxxxxxxxx> * ns/batched-fsync (2021-10-08) 8 commits - core.fsyncobjectfiles: performance tests for add and stash - core.fsyncobjectfiles: tests for batch mode - unpack-objects: use the bulk-checkin infrastructure - update-index: use the bulk-checkin infrastructure - core.fsyncobjectfiles: add windows support for batch mode - core.fsyncobjectfiles: batched disk flushes - bulk-checkin: rename 'state' variable and separate 'plugged' boolean - Merge branch 'ns/tmp-objdir' into ns/batched-fsync (this branch uses ns/tmp-objdir.) The "core.fsyncobjectfiles" configuration variable can now be set to "batch" for improved performance. Will merge to 'next'? * en/zdiff3 (2021-09-20) 2 commits - update documentation for new zdiff3 conflictStyle - xdiff: implement a zealous diff3, or "zdiff3" "Zealous diff3" style of merge conflict presentation has been added. * js/scalar (2021-10-07) 15 commits - scalar: accept -C and -c options before the subcommand - scalar: implement the `version` command - scalar: implement the `delete` command - scalar: teach 'reconfigure' to optionally handle all registered enlistments - scalar: allow reconfiguring an existing enlistment - scalar: implement the `run` command - scalar: teach 'clone' to support the --single-branch option - scalar: implement the `clone` subcommand - scalar: implement 'scalar list' - scalar: let 'unregister' handle a deleted enlistment directory gracefully - scalar: 'unregister' stops background maintenance - scalar: 'register' sets recommended config and starts maintenance - scalar: create test infrastructure - scalar: start documenting the command - scalar: create a rudimentary executable Add pieces from "scalar" to contrib/. What's the status of this thing? * ms/customizable-ident-expansion (2021-09-01) 1 commit - keyword expansion: make "$Id$" string configurable Instead of "$Id$", user-specified string (like $FreeBSD$) can be used as an in-blob placeholder for keyword expansion. What's the status of this one? Meh? * ab/refs-errno-cleanup (2021-10-16) 21 commits - refs API: post-migration API renaming [2/2] - refs API: post-migration API renaming [1/2] - refs API: don't expose "errno" in run_transaction_hook() - refs API: make expand_ref() & repo_dwim_log() not set errno - refs API: make resolve_ref_unsafe() not set errno - refs API: make refs_ref_exists() not set errno - refs API: make refs_resolve_refdup() not set errno - refs tests: ignore ignore errno in test-ref-store helper - refs API: ignore errno in worktree.c's find_shared_symref() - refs API: ignore errno in worktree.c's add_head_info() - refs API: make files_copy_or_rename_ref() et al not set errno - refs API: make loose_fill_ref_dir() not set errno - refs API: make resolve_gitlink_ref() not set errno - refs API: remove refs_read_ref_full() wrapper - refs/files: remove "name exist?" check in lock_ref_oid_basic() - reflog tests: add --updateref tests - refs API: make refs_rename_ref_available() static - refs API: make parse_loose_ref_contents() not set errno - refs API: make refs_read_raw_ref() not set errno - refs API: add a version of refs_resolve_ref_unsafe() with "errno" - branch tests: test for errno propagating on failing read The "remainder" of hn/refs-errno-cleanup topic. Will merge to 'next'? * ab/only-single-progress-at-once (2021-10-13) 10 commits - progress.c: add & assert a "global_progress" variable - various *.c: use isatty(1|2), not isatty(STDIN_FILENO|STDERR_FILENO) - pack-bitmap-write.c: don't return without stop_progress() - progress.c: add temporary variable from progress struct - progress.c: call progress_interval() from progress_test_force_update() - progress.c: move signal handler functions lower - progress.c tests: test some invalid usage - progress.c tests: make start/stop verbs on stdin - progress.c test helper: add missing braces - leak tests: fix a memory leaks in "test-progress" helper Further tweaks on progress API. Will merge to 'next'? * fs/ssh-signing (2021-09-10) 9 commits (merged to 'next' on 2021-10-11 at b456b95672) + ssh signing: test that gpg fails for unknown keys + ssh signing: tests for logs, tags & push certs + ssh signing: duplicate t7510 tests for commits + ssh signing: verify signatures using ssh-keygen + ssh signing: provide a textual signing_key_id + ssh signing: retrieve a default key from ssh-agent + ssh signing: add ssh key format and signing code + ssh signing: add test prereqs + ssh signing: preliminary refactoring and clean-up (this branch is used by fs/ssh-signing-fix.) Use ssh public crypto for object and push-cert signing. Will merge to 'master'. * hn/reftable (2021-10-08) 19 commits - Add "test-tool dump-reftable" command. - reftable: add dump utility - reftable: implement stack, a mutable database of reftable files. - reftable: implement refname validation - reftable: add merged table view - reftable: add a heap-based priority queue for reftable records - reftable: reftable file level tests - reftable: read reftable files - reftable: generic interface to tables - reftable: write reftable files - reftable: a generic binary tree implementation - reftable: reading/writing blocks - Provide zlib's uncompress2 from compat/zlib-compat.c - reftable: (de)serialization for the polymorphic record type. - reftable: add blocksource, an abstraction for random access reads - reftable: utility functions - reftable: add error related functionality - reftable: add LICENSE - hash.h: provide constants for the hash IDs The "reftable" backend for the refs API, without integrating into the refs subsystem. -------------------------------------------------- [Discarded] * en/remerge-diff (2021-08-31) 7 commits . doc/diff-options: explain the new --remerge-diff option . show, log: provide a --remerge-diff capability . tmp-objdir: new API for creating and removing primary object dirs . merge-ort: capture and print ll-merge warnings in our preferred fashion . ll-merge: add API for capturing warnings in a strbuf instead of stderr . merge-ort: add ability to record conflict messages in a file . merge-ort: mark a few more conflict messages as omittable A new presentation for two-parent merge "--remerge-diff" can be used to show the difference between mechanical (and possibly conflicted) merge results and the recorded resolution.
