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 tip of the 'master' branch is still at v2.34.0. A few topics for regression fixes have been merged to 'next' and will be merged to 'master' shortly. There are many topics listed as "New" that are in 'seen', but I haven't read many of them (and I shouldn't have anyway, before dealing with regression fixes) and haven't gave any summary comments in this report, either, yet. 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/ -------------------------------------------------- [New Topics] * ab/checkout-branch-info-leakfix (2021-11-18) 1 commit - checkout: fix "branch info" memory leaks Leakfix. Will merge to 'next'. * ab/make-dependency (2021-11-18) 24 commits - Makefile: move ".SUFFIXES" rule to shared.mak - Makefile: define $(LIB_H) in terms of $(FIND_SOURCE_FILES) - Makefile: disable GNU make built-in wildcard rules - Makefile: use $(file) I/O instead of "FORCE" when possible - Makefile: correct the dependency graph of hook-list.h - Makefiles: add and use wildcard "mkdir -p" template - Makefile: use $(wspfx) for $(QUIET...) in shared.mak - Makefile: add "$(QUIET)" boilerplate to shared.mak - Makefile: add a "TRACK_template" for GIT-*{FLAGS,DEFINES,...} - Makefile: re-add and use the "shellquote" macros - Makefile: move $(comma), $(empty) and $(space) to shared.mak - Makefiles: add "shared.mak", move ".DELETE_ON_ERROR" to it - Makefile: stop needing @@GIT_VERSION@@ in *.perl scripts - Makefile: create a GIT-PYTHON-DEFINES, like "PERL" - Makefile: correct "GIT-PERL-{DEFINES,HEADER}" dependency graph - Makefile: adjust Perl-related comments & whitespace - Makefile: change "ifndef NO_PERL" to "ifdef NO_PERL" - Makefile: guard Perl-only variable assignments - Makefile: remove "mv $@ $@+" dance redundant to .DELETE_ON_ERROR - Makefile: clean perl/build/ even with NO_PERL=Y - Makefile: use "=" not ":=" for po/* and perl/* - Makefile: don't set up "perl/build" rules under NO_PERL=Y - Makefile: don't invoke msgfmt with --statistics - Merge branch 'ab/sh-retire-helper-functions' into ab/make-dependency (this branch uses ab/sh-retire-helper-functions.) * ah/advice-pull-has-no-preference-between-rebase-and-merge (2021-11-19) 1 commit - pull: don't say that merge is "the default strategy" The advice message given by "git pull" when the user hasn't made a choice between merge and rebase still said that the merge is the default, which no longer is the case. This has been corrected. Will merge to 'next'. * ds/fetch-pull-with-sparse-index (2021-11-18) 3 commits - ls-files: add --sparse option - fetch/pull: use the sparse index - Merge branch 'ld/sparse-diff-blame' into ds/fetch-pull-with-sparse-index (this branch uses ld/sparse-diff-blame and vd/sparse-reset.) * ev/pull-already-up-to-date-is-noop (2021-11-18) 1 commit (merged to 'next' on 2021-11-19 at 2d8f0cd000) + pull: should be noop when already-up-to-date "git pull" with any strategy when the other side is behind us should succeed as it is a no-op, but doesn't. Will merge to 'master'. * fs/ssh-signing-other-keytypes (2021-11-19) 2 commits - ssh signing: make sign/amend test more resilient - ssh signing: support non ssh-* keytypes * fs/test-prereq (2021-11-18) 2 commits - test-lib: introduce required prereq for test runs - test-lib: show missing prereq summary * jk/t5319-midx-corruption-test-deflake (2021-11-18) 1 commit - t5319: corrupt more bytes of the midx checksum Test fix. * js/trace2-avoid-recursive-errors (2021-11-18) 1 commit - trace2: disable tr2_dst before warning on write errors trace2 error code path fix. * pw/xdiff-classify-record-in-histogram (2021-11-18) 3 commits - xdiff: simplify comparison - xdiff: avoid unnecessary memory allocations - diff histogram: intern strings "diff --histogram" optimization. * rs/mergesort (2021-11-18) 1 commit - mergesort: avoid left shift overflow Bitop fix for 32-bit boxes. * xw/am-empty (2021-11-19) 3 commits - SQUASH??? - am: support --empty=<option> to handle empty patches - doc: git-format-patch: describe the option --always * hk/ci-checkwhitespace-commentfix (2021-11-19) 1 commit - ci(check-whitespace): update stale file top comments Comment fix. * hm/paint-hits-in-log-grep (2021-11-19) 1 commit (merged to 'next' on 2021-11-19 at e146d25c7c) + Revert "grep/pcre2: fix an edge case concerning ascii patterns and UTF-8 data" "git grep" looking in a blob that has non-UTF8 payload was completely broken when linked with certain versions of PCREv2 library in the latest release. Will merge to 'master'. * jk/fetch-pack-avoid-sigpipe-to-index-pack (2021-11-19) 1 commit - fetch-pack: ignore SIGPIPE when writing to index-pack "git fetch", when received a bad packfile, can fail with SIGPIPE. This wasn't wrong per-se, but we now detect the situation and fail in a more predictable way. Will merge to 'next'. * jk/refs-g11-workaround (2021-11-19) 1 commit - refs: work around gcc-11 warning with REF_HAVE_NEW Workaround for a false-alarm by gcc-11 Will merge to 'next'. -------------------------------------------------- [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. * 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. Getting tired of waiting for a reroll; will discard. -------------------------------------------------- [Cooking] * mp/absorb-submodule-git-dir-upon-deinit (2021-11-19) 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. Will merge to 'next'? * rj/receive-pack-avoid-sigpipe-during-status-reporting (2021-11-10) 1 commit - receive-pack: ignore SIGPIPE while reporting status to client When the "git push" command is killed while the receiving end is trying to report what happened to the ref update proposals, the latter used to die, due to SIGPIPE. The code now ignores SIGPIPE to increase our chances to run the post-receive hook after it happens. * ab/parse-options-cleanup (2021-11-10) 1 commit - parse-options.c: use "enum parse_opt_result" for parse_nodash_opt() Change the type of an internal function to return an enum (instead of int) and replace -2 that was used to signal an error with -1. * cw/protocol-v2-doc-fix (2021-11-11) 1 commit - protocol-v2.txt: align delim-pkt spec with usage Doc update. Will merge to 'next'. * jt/pack-header-lshift-overflow (2021-11-11) 1 commit - packfile: avoid overflowing shift during decode The code to decode the length of packed object size has been corrected. Will merge to 'next'. * ab/update-submitting-patches (2021-11-13) 1 commit (merged to 'next' on 2021-11-19 at b44f4d0eb0) + SubmittingPatches: fix Asciidoc syntax in "GitHub CI" section Doc fix. Will merge to 'master'. * bc/require-c99 (2021-11-18) 1 commit - git-compat-util: add a test balloon for C99 support Weather balloon to break people with compilers that do not support C99. * jc/c99-var-decl-in-for-loop (2021-11-16) 1 commit - revision: use C99 declaration of variable in for() loop Weather balloon to break comiplers that do not grok variable declaration in the for() loop. * tl/midx-docfix (2021-11-18) 1 commit - midx: fix a formatting issue in "multi-pack-index.txt" Doc mark-up fix. Will merge to 'next'. * ak/protect-any-current-branch (2021-11-15) 8 commits - branch: protect branches checked out in all worktrees - receive-pack: protect current branch for bare repository worktree - receive-pack: clean dead code from update_worktree() - fetch: protect branches checked out in all worktrees - worktree: simplify find_shared_symref() memory ownership model - branch: lowercase error messages - receive-pack: lowercase error messages - fetch: lowercase error messages "git fetch" without the "--update-head-ok" option ought to protect a checked out branch from getting updated, to prevent the working tree that checks it out to go out of sync. The code was written before the use of "git worktree" got widespread, and only checked the branch that was checked out in the current worktree, which has been updated. (originally called ak/fetch-not-overwrite-any-current-branch) Will merge to 'next'? * jk/test-bitmap-fix (2021-11-05) 1 commit - test_bitmap_hashes(): handle repository without bitmaps Tighten code for testing pack-bitmap. Will merge to 'next'. * jk/jump-merge-with-pathspec (2021-11-09) 1 commit - git-jump: pass "merge" arguments to ls-files The "merge" subcommand of "git jump" (in contrib/) silently ignored pathspec and other parameters. Will merge to 'next'. * jk/strbuf-addftime-seconds-since-epoch (2021-11-04) 1 commit - strbuf_addftime(): handle "%s" manually The "--date=format:<strftime>" gained a workaround for the lack of system support for a non-local timezone to handle "%s" placeholder. Will merge to 'next'. * js/ci-no-directional-formatting (2021-11-04) 1 commit - ci: disallow directional formatting CI has been taught to catch some Unicode directional formatting sequence that can be used in certain mischief. Will merge to 'next'. * tw/var-default-branch (2021-11-03) 1 commit - var: add GIT_DEFAULT_BRANCH variable "git var GIT_DEFAULT_BRANCH" is a way to see what name is used for the newly created branch if "git init" is run. Will merge to 'next'. * ab/mark-leak-free-tests-even-more (2021-11-01) 15 commits - leak tests: mark some fast-import tests as passing with SANITIZE=leak - leak tests: mark some config tests as passing with SANITIZE=leak - leak tests: mark some status tests as passing with SANITIZE=leak - leak tests: mark some clone tests as passing with SANITIZE=leak - leak tests: mark some add tests as passing with SANITIZE=leak - leak tests: mark some diff tests as passing with SANITIZE=leak - leak tests: mark some apply tests as passing with SANITIZE=leak - leak tests: mark some notes tests as passing with SANITIZE=leak - leak tests: mark some update-index tests as passing with SANITIZE=leak - leak tests: mark some rev-parse tests as passing with SANITIZE=leak - leak tests: mark some rev-list tests as passing with SANITIZE=leak - leak tests: mark some misc tests as passing with SANITIZE=leak - leak tests: mark most gettext tests as passing with SANITIZE=leak - leak tests: mark "sort" test as passing SANITIZE=leak - leak tests: mark a read-tree test as passing SANITIZE=leak More tests are marked as leak-free. Will merge to 'next'? * if/redact-packfile-uri (2021-11-11) 2 commits - http-fetch: redact url on die() message - fetch-pack: redact packfile urls in traces Redact the path part of packfile URI that appears in the trace output. Will merge to 'next'. * ew/test-wo-fsync (2021-10-29) 1 commit - tests: disable fsync everywhere Allow running our tests while disabling internal fsync. * ja/doc-cleanup (2021-11-09) 10 commits - init doc: --shared=0xxx does not give umask but perm bits - doc: git-init: clarify file modes in octal. - doc: git-http-push: describe the refs as pattern pairs - doc: uniformize <URL> placeholders' case - doc: use three dots for indicating repetition instead of star - doc: git-ls-files: express options as optional alternatives - doc: use only hyphens as word separators in placeholders - doc: express grammar placeholders between angle brackets - doc: split placeholders as individual tokens - doc: fix git credential synopsis Doc update. Will merge to 'next'. * re/color-default-reset (2021-10-28) 3 commits - color: allow colors to be prefixed with "reset" - color: support "default" to restore fg/bg color - color: add missing GIT_COLOR_* white/black constants "default" and "reset" colors have been added to our palette. Will merge to 'next'? * jc/fix-first-object-walk (2021-10-29) 2 commits - docs: add headers in MyFirstObjectWalk - docs: fix places that break compilation in MyFirstObjectWalk Doc update. Will merge to 'next'? * jc/unsetenv-returns-an-int (2021-10-29) 1 commit (merged to 'next' on 2021-11-01 at a11670a5a5) + unsetenv(3) returns int, not void The compatibility implementation for unsetenv(3) were written to mimic ancient, non-POSIX, variant seen in an old glibc; it has been changed to return an integer to match the more modern era. Will cook in 'next'. * mc/clean-smudge-with-llp64 (2021-11-03) 8 commits (merged to 'next' on 2021-11-03 at fe5160a170) + clean/smudge: allow clean filters to process extremely large files + odb: guard against data loss checking out a huge file + git-compat-util: introduce more size_t helpers + odb: teach read_blob_entry to use size_t + t1051: introduce a smudge filter test for extremely large files + test-lib: add prerequisite for 64-bit platforms + test-tool genzeros: generate large amounts of data more efficiently + test-genzeros: allow more than 2G zeros in Windows The clean/smudge conversion code path has been prepared to better work on platforms where ulong is narrower than size_t. Will cook in 'next'. * pw/diff-color-moved-fix (2021-10-27) 15 commits - 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: rewind when discarding pmb - diff --color-moved: factor out function - diff --color-moved: clear all flags on blocks that are too short - diff --color-moved: add perf tests Long-overdue correctness and performance update to "diff --color-moved" feature. * ab/generate-command-list (2021-11-05) 10 commits - generate-cmdlist.sh: don't parse command-list.txt thrice - generate-cmdlist.sh: replace "grep' invocation with a shell version - generate-cmdlist.sh: do not shell out to "sed" - generate-cmdlist.sh: stop sorting category lines - generate-cmdlist.sh: replace for loop by printf's auto-repeat feature - generate-cmdlist.sh: run "grep | sort", not "sort | grep" - generate-cmdlist.sh: don't call get_categories() from category_list() - generate-cmdlist.sh: spawn fewer processes - generate-cmdlist.sh: trivial whitespace change - command-list.txt: sort with "LC_ALL=C sort" Build optimization. * ab/sh-retire-helper-functions (2021-10-21) 6 commits (merged to 'next' on 2021-11-03 at 4b49d9f4be) + git-sh-setup: remove "sane_grep", it's not needed anymore + git-sh-setup: remove unused sane_egrep() function + git-instaweb: unconditionally assume that gitweb is mod_perl capable + Makefile: remove $(NO_CURL) from $(SCRIPT_DEFINES) + Makefile: remove $(GIT_VERSION) from $(SCRIPT_DEFINES) + Makefile: move git-SCRIPT-DEFINES adjacent to $(SCRIPT_DEFINES) (this branch is used by ab/make-dependency.) Make a few helper functions unused and then lose them. Will cook in 'next'. * ow/stash-count-in-status-porcelain-output (2021-10-21) 2 commits (merged to 'next' on 2021-10-29 at 1a01b886e5) + status: print stash info with --porcelain=v2 --show-stash + status: count stash entries in separate function Allow "git status --porcelain=v2" to show the number of stash entries with --show-stash like the normal output does. Will cook in 'next'. * tb/plug-pack-bitmap-leaks (2021-10-28) 9 commits (merged to 'next' on 2021-11-01 at 47d218862b) + pack-bitmap.c: more aggressively free in free_bitmap_index() + pack-bitmap.c: don't leak type-level bitmaps + midx.c: write MIDX filenames to strbuf + builtin/multi-pack-index.c: don't leak concatenated options + builtin/repack.c: avoid leaking child arguments + builtin/pack-objects.c: don't leak memory via arguments + t/helper/test-read-midx.c: free MIDX within read_midx_file() + midx.c: don't leak MIDX from verify_midx_file + midx.c: clean up chunkfile after reading the MIDX Leakfix. Will cook in 'next'. * es/pretty-describe-more (2021-11-01) 3 commits - pretty: add abbrev option to %(describe) - pretty: add tag option to %(describe) - pretty.c: rework describe options parsing for better extensibility Extend "git log --format=%(describe)" placeholder to allow passing selected command-line options to the underlying "git describe" command. Will merge to 'next'? * fs/ssh-signing-key-lifetime (2021-11-18) 10 commits - ssh signing: verify ssh-keygen in test prereq - ssh signing: make fmt-merge-msg consider key lifetime - ssh signing: make verify-tag consider key lifetime - ssh signing: make git log verify key lifetime - ssh signing: make verify-commit consider key lifetime - ssh signing: add key lifetime test prereqs - ssh signing: use sigc struct to pass payload - Merge branch 'ad/ssh-signing-testfix' into fs/ssh-signing-key-lifetime - Merge branch 'fs/ssh-signing-fix' into fs/ssh-signing-key-lifetime - Merge branch 'fs/ssh-signing' into fs/ssh-signing-key-lifetime Extend the signing of objects with SSH keys and learn to pay attention to the key validity time range when verifying. Will merge to 'next'? * jc/doc-submitting-patches-choice-of-base (2021-10-25) 2 commits - (wip) reword the final review part - SubmittingPatchs: clarify choice of base and testing Extend the guidance to choose the base commit to build your work on, and hint/nudge contributors to read others' changes. * gc/remote-with-fewer-static-global-variables (2021-11-18) 5 commits - remote: die if branch is not found in repository - remote: remove the_repository->remote_state from static methods - remote: use remote_state parameter internally - remote: move static variables into per-repository struct - t5516: add test case for pushing remote refspecs 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 (merged to 'next' on 2021-10-25 at f66ca39ebe) + urlmatch: add underscore to URL_HOST_CHARS Treat "_" as any other URL-valid characters in an URL when matching the per-URL configuration variable names. Will cook in 'next'. * ab/config-based-hooks-2 (2021-11-01) 18 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 - hooks: convert worktree 'post-checkout' hook to hook library - hooks: convert non-worktree 'post-checkout' hook to hook library - merge: convert post-merge to use hook.h - am: convert applypatch-msg to use hook.h - rebase: convert pre-rebase to use hook.h - hook API: add a run_hooks_l() wrapper - am: convert {pre,post}-applypatch to use hook.h - gc: use hook library for pre-auto-gc hook - hook API: add a run_hooks() wrapper - hook: add 'run' subcommand - Merge branch 'ab/config-based-hooks-1' into ab/config-based-hooks-2 More "config-based hooks". * so/stash-staged (2021-10-28) 2 commits (merged to 'next' on 2021-10-29 at 50335e8eeb) + stash: get rid of unused argument in stash_staged() (merged to 'next' on 2021-10-25 at 68b88e35c4) + 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 cook in 'next'. * vd/sparse-sparsity-fix-on-read (2021-10-27) 3 commits - sparse-index: update do_read_index to ensure correct sparsity - sparse-index: add ensure_correct_sparsity function - 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. Will merge to 'next'? * jc/fix-ref-sorting-parse (2021-10-20) 2 commits (merged to 'next' on 2021-10-29 at e3ec6e8e77) + for-each-ref: delay parsing of --sort=<atom> options + Merge branch 'ab/ref-filter-leakfix' into jc/fix-ref-sorting-parse 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 cook in 'next'. * jc/tutorial-format-patch-base (2021-10-23) 1 commit (merged to 'next' on 2021-10-29 at 67ff1a5a77) + 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. Will cook in 'next'. * js/branch-track-inherit (2021-11-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. * jh/builtin-fsmonitor-part2 (2021-10-21) 29 commits - t7527: test status with untracked-cache and fsmonitor--daemon - fsmonitor: force update index after large responses - fsmonitor--daemon: use a cookie file to sync with file system - fsmonitor--daemon: periodically truncate list of modified files - t/perf/p7519: add fsmonitor--daemon test cases - t/perf/p7519: speed up test on Windows - t/helper/test-chmtime: skip directories on Windows - t/perf: avoid copying builtin fsmonitor files into test repo - t7527: create test for fsmonitor--daemon - t/helper/fsmonitor-client: create IPC client to talk to FSMonitor Daemon - help: include fsmonitor--daemon feature flag in version info - fsmonitor--daemon: implement handle_client callback - compat/fsmonitor/fsm-listen-darwin: implement FSEvent listener on MacOS - compat/fsmonitor/fsm-listen-darwin: add macos header files for FSEvent - compat/fsmonitor/fsm-listen-win32: implement FSMonitor backend on Windows - fsmonitor--daemon: create token-based changed path cache - fsmonitor--daemon: define token-ids - fsmonitor--daemon: add pathname classification - fsmonitor--daemon: implement 'start' command - fsmonitor--daemon: implement 'run' command - compat/fsmonitor/fsm-listen-darwin: stub in backend for Darwin - compat/fsmonitor/fsm-listen-win32: stub in backend for Windows - fsmonitor--daemon: implement 'stop' and 'status' commands - fsmonitor--daemon: add a built-in fsmonitor daemon - fsmonitor: document builtin fsmonitor - 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). * ld/sparse-diff-blame (2021-10-27) 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 is used by ds/fetch-pull-with-sparse-index; uses vd/sparse-reset.) Teach diff and blame to work well with sparse index. Expecting a reroll. cf. <YXgpqJIS2OgOgS+k@nand.local> * ns/remerge-diff (2021-10-27) 9 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 - 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-27) 4 commits (merged to 'next' on 2021-10-27 at 001a18c0e1) + fixup! tmp-objdir: new API for creating temporary writable databases + fixup! tmp-objdir: new API for creating temporary writable databases (merged to 'next' on 2021-10-23 at 358d376f61) + 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. On hold. cf. <xmqqo87auqda.fsf@gitster.g> * vd/sparse-reset (2021-10-27) 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 ds/fetch-pull-with-sparse-index and ld/sparse-diff-blame.) Various operating modes of "git reset" have been made to work better with the sparse index. Will merge to 'next'? * 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. * es/superproject-aware-submodules (2021-11-18) 5 commits - submodule: use config to find superproject worktree - 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). * tp/send-email-completion (2021-10-28) 2 commits (merged to 'next' on 2021-11-01 at 7104356cc0) + send-email docs: add format-patch options + send-email: programmatically generate bash completions 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. Will cook in 'next'. * ns/batched-fsync (2021-10-27) 9 commits (merged to 'next' on 2021-10-27 at eb2a3afdd1) + Merge branch 'ns/tmp-objdir' into ns/batched-fsync (merged to 'next' on 2021-10-25 at e45c907d41) + 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. On hold. cf. <xmqqo87auqda.fsf@gitster.g> * 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. What's the status of this thing? * js/scalar (2021-11-19) 17 commits - 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 - ci: also run the `scalar` tests - cmake: optionally build `scalar`, too - scalar: create test infrastructure - scalar: start documenting the command - scalar: create a rudimentary executable - scalar: add a README with a roadmap Add pieces from "scalar" to contrib/. * 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. * ab/refs-errno-cleanup (2021-10-16) 21 commits (merged to 'next' on 2021-10-29 at 3f57147176) + 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 cook in 'next'. * ab/only-single-progress-at-once (2021-11-03) 8 commits - progress.c: add & assert a "global_progress" variable - various *.c: use isatty(0|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 tests: test some invalid usage - progress.c tests: make start/stop commands on stdin - progress.c test helper: add missing braces - leak tests: fix a memory leaks in "test-progress" helper Further tweaks on progress API. * 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. Will merge to 'next'?
