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. 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] * jk/http-server-protocol-versions (2021-09-10) 5 commits - docs/protocol-v2: point readers transport config discussion - docs/git: discuss server-side config for GIT_PROTOCOL - docs/http-backend: mention v2 protocol - http-backend: handle HTTP_GIT_PROTOCOL CGI variable - t5551: test v2-to-v0 http protocol fallback Taking advantage of the CGI interface, http-backend has been updated to enable protocol v2 automatically when the other side asks for it. Will merge to 'next'. * ab/align-parse-options-help (2021-09-12) 4 commits - 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/help-config-vars (2021-09-10) 6 commits - fixup! help / completion: make "git help" do the hard work - help / completion: make "git help" do the hard work - 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. * en/am-abort-fix (2021-09-10) 3 commits - am: fix incorrect exit status on am fail to abort - t4151: add a few am --abort tests - git-am.txt: clarify --abort behavior When "git am --abort" fails to abort correctly, it still exited with exit status of 0, which has been corrected. Will merge to 'next'. * tb/repack-write-midx (2021-09-10) 8 commits - 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: 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 uses tb/multi-pack-bitmaps.) "git repack" has been taught to generate multi-pack reachability bitmaps. * ab/gc-remove-unused-call (2021-09-12) 1 commit - gc: remove unused launchctl_get_uid() call Code clean-up. Will merge to 'next'. * ab/test-tool-run-command-cleanup (2021-09-12) 1 commit - test-tool run-command: fix flip-flop init pattern Code clean-up. Will merge to 'next'. * ab/unused-script-helpers (2021-09-12) 4 commits - test-lib: remove unused $_x40 and $_z40 variables - git-bisect: remove unused SHA-1 $x40 shell variable - git-sh-setup: remove unused "pull with rebase" message - git-submodule: remove unused is_zero_oid() function Code clean-up. Will merge to 'next'. * cb/unix-sockets-with-windows (2021-09-12) 3 commits - git-compat-util: include declaration for unix sockets - credential-cache: check for windows specific errors - t0301: fixes for windows compatibility Adjust credential-cache helper to Windows. Expecting a reroll. * ds/add-rm-with-sparse-index (2021-09-12) 14 commits - 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 - dir: extract directory-matching logic - t1092: behavior for adding sparse files - t3705: test that 'sparse_entry' is unstaged (this branch uses ds/mergies-with-sparse-index and ds/sparse-index-ignored-files.) "git add", "git mv", and "git rm" have been adjusted to work better with the sparse index. * en/tests-cleanup-leftover-untracked (2021-09-12) 1 commit - tests: remove leftover untracked files Test clean-up. Will merge to 'next'. * jk/strvec-typefix (2021-09-12) 1 commit - strvec: use size_t to store nr and alloc Correct nr and alloc members of strvec struct to be of type size_t. Will merge to 'next'. * rs/drop-core-compression-vars (2021-09-12) 1 commit - compression: drop write-only core_compression_* variables Code clean-up. Will merge to 'next'. * rs/packfile-bad-object-list-in-oidset (2021-09-12) 5 commits - packfile: use oidset for bad objects - packfile: convert has_packed_and_bad() to object_id - packfile: convert mark_bad_packed_object() to object_id - midx: inline nth_midxed_pack_entry() - oidset: make oidset_size() an inline function Replace a handcrafted data structure used to keep track of bad objects in the packfile API by an oidset. Will merge to 'next'. * tb/midx-write-propagate-namehash (2021-09-12) 4 commits - t5326: test propagating hashcache values - midx.c: respect 'pack.writeBitmapHashcache' when writing bitmaps - pack-bitmap.c: propagate namehash values from existing bitmaps - t/helper/test-bitmap.c: add 'dump-hashes' mode (this branch uses tb/multi-pack-bitmaps.) "git multi-pack-bitmap write" learns to propagate the hashcache from original bitmap to resulting bitmap. * ab/retire-option-argument (2021-09-12) 4 commits - parse-options API: remove OPTION_ARGUMENT feature - difftool: use run_command() API in run_file_diff() - difftool: prepare "diff" cmdline in cmd_difftool() - difftool: prepare "struct child_process" in cmd_difftool() An oddball OPTION_ARGUMENT feature has been removed from the parse-options API. Will merge to 'next'. * po/git-config-doc-mentions-help-c (2021-09-13) 1 commit - doc: config, tell readers of `git help --config` Doc update. Will merge to 'next'. * pw/rebase-on-a-tag-fix (2021-09-13) 11 commits - rebase: dereference tags - rebase: use lookup_commit_reference_by_name() - rebase: use our standard error return value - rebase: remove redundant strbuf - t3407: rework rebase --quit tests - t3407: strengthen rebase --abort tests - t3407: use test_path_is_missing - t3407: rename a variable - t3407: use test_cmp_rev - t3407: use test_commit - t3407: run tests in $TEST_DIRECTORY "git rebase <upstream> <tag>" failed when aborted in the middle, as it mistakenly tried to write the tag object instead of peeling it to HEAD. Expecting a reroll. -------------------------------------------------- [Stalled] * ab/pack-objects-stdin (2021-07-09) 5 commits - pack-objects.c: make use of REV_INFO_STDIN_LINE_PROCESS - pack-objects.c: do stdin parsing via revision.c's API - revision.[ch]: add a "handle_stdin_line" API - revision.h: refactor "disable_stdin" and "read_from_stdin" - upload-pack: run is_repository_shallow() before setup_revisions() Introduce handle_stdin_line callback to revision API and uses it. Waiting for reviews. * es/config-based-hooks (2021-09-09) 6 commits - hook: allow out-of-repo 'git hook' invocations - hook: include hooks from the config - hook: introduce "git hook list" - hook: allow parallel hook execution - fixup! hook: run a list of hooks instead - hook: run a list of hooks instead (this branch uses ab/config-based-hooks-base.) Revamp the hooks subsystem to allow multiple of them to trigger upon the same event and control via the configuration variables. On hold. This is an interim one that goes with the updated ab/config-based-hooks-base. * jh/builtin-fsmonitor (2021-09-03) 37 commits - fixup! fsmonitor--daemon: implement handle_client callback - SQUASH??? https://github.com/git/git/runs/3438543601?check_suite_focus=true#step:5:136 - BANDAID: sparse fixes - t7527: test FS event reporing on MacOS WRT case and Unicode - fsmonitor: handle shortname for .git - t7527: test status with untracked-cache and fsmonitor--daemon - fsmonitor: force update index after large responses - fsmonitor: enhance existing comments - fsmonitor--daemon: use a cookie file to sync with file system - fsmonitor--daemon: periodically truncate list of modified files - t7527: create test for fsmonitor--daemon - t/perf/p7519: add fsmonitor--daemon test cases - t/perf: avoid copying builtin fsmonitor files into test repo - t/perf/p7519: speed up test using "test-tool touch" - t/helper/test-touch: add helper to touch a series of files - fsmonitor--daemon: implement handle_client callback - fsmonitor-fs-listen-macos: implement FSEvent listener on MacOS - fsmonitor-fs-listen-macos: add macos header files for FSEvent - fsmonitor-fs-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: do not try to operate on bare repos - fsmonitor--daemon: implement 'start' command - fsmonitor--daemon: implement 'run' command - fsmonitor-fs-listen-macos: stub in backend for MacOS - fsmonitor-fs-listen-win32: stub in backend for Windows - t/helper/fsmonitor-client: create IPC client to talk to FSMonitor Daemon - fsmonitor--daemon: implement 'stop' and 'status' commands - fsmonitor--daemon: add a built-in fsmonitor daemon - fsmonitor: use IPC to query the builtin FSMonitor daemon - fsmonitor: config settings are repository-specific - help: include fsmonitor--daemon feature flag in version info - fsmonitor-ipc: create client routines for git-fsmonitor--daemon - fsmonitor--daemon: update fsmonitor documentation - fsmonitor--daemon: man page - simple-ipc: preparations for supporting binary messages. An attempt to write and ship with a watchman equivalent tailored for our use. Expecting a reroll post 2.33 release. * es/superproject-aware-submodules (2021-08-19) 5 commits - fixup! introduce submodule.superprojectGitDir record - 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). Looking good. * ao/p4-avoid-decoding (2021-04-12) 2 commits - git-p4: do not decode data from perforce by default - git-p4: avoid decoding more data from perforce "git p4" in Python-2 days used to accept a lot more kinds of data from Perforce server as uninterrupted byte sequence, but after switching to Python-3, too many things are expected to be in UTF-8, which broke traditional use cases. Will discard. Have been stalled for too long. cf. <20210504220153.1d9f0cb2@ado-tr> * tv/p4-fallback-encoding (2021-04-30) 1 commit - git-p4: git-p4.fallbackEncoding to specify non UTF-8 charset "git p4" learns the fallbackEncoding configuration variable to safely accept changeset descriptions that aren't written in UTF-8. Will discard. Have been stalled for too long. cf. <CAKu1iLUaLuAZWqjNK4tfhhR=YaSt4MdQ+90ZY-JcEh_SeHyYCw@xxxxxxxxxxxxxx> * ab/fsck-unexpected-type (2021-09-07) 22 commits - fsck: report invalid object type-path combinations - fsck: report invalid types recorded in objects - object-store.h: move read_loose_object() below 'struct object_info' - fsck: don't hard die on invalid object types - object-file.c: use "enum" return type for unpack_loose_header() - object-file.c: return -2 on "header too long" in unpack_loose_header() - object-file.c: return -1, not "status" from unpack_loose_header() - object-file.c: guard against future bugs in loose_object_info() - object-file.c: stop dying in parse_loose_header() - object-file.c: split up ternary in parse_loose_header() - object-file.c: simplify unpack_loose_short_header() - object-file.c: add missing braces to loose_object_info() - object-file.c: make parse_loose_header_extended() public - object-file.c: don't set "typep" when returning non-zero - cache.h: move object functions to object-store.h - cat-file tests: test for current --allow-unknown-type behavior - cat-file tests: add corrupt loose object test - rev-list tests: test for behavior with invalid object types - cat-file tests: test that --allow-unknown-type isn't on by default - cat-file tests: test for missing object with -t and -s - fsck tests: add test for fsck-ing an unknown type - fsck tests: refactor one test to use a sub-repo "git fsck" has been taught to report mismatch between expected and actual types of an object better. Needs review. -------------------------------------------------- [Cooking] * en/zdiff3 (2021-09-12) 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. * en/stash-df-fix (2021-09-10) 3 commits - stash: restore untracked files AFTER restoring tracked files - stash: avoid feeding directories to update-index - t3903: document a pair of directory/file bugs Fix "git stash" corner case where the tentative change involves changing a directory to a file (or vice versa). * js/pull-release-packs-before-fetching (2021-09-08) 2 commits + pull: release packs before fetching + commit-graph: when closing the graph, also release the slab (this branch is used by js/run-command-close-packs.) "git pull" was taught to close open file descriptors to the packfiles before spawning "git fetch" to help auto-gc that may be invoked by it. * ab/http-drop-old-curl-plus (2021-09-13) 9 commits - http: don't hardcode the value of CURL_SOCKOPT_OK - http: centralize the accounting of libcurl dependencies - http: correct curl version check for CURLOPT_PINNEDPUBLICKEY - http: correct version check for CURL_HTTP_VERSION_2 - http: drop support for curl < 7.18.0 (again) - Makefile: drop support for curl < 7.9.8 (again) - INSTALL: mention that we need libcurl 7.19.4 or newer to build - INSTALL: reword and copy-edit the "libcurl" section - INSTALL: don't mention the "curl" executable at all Conditional compilation around versions of libcURL has been straightened out. Will merge to 'next'. * ds/mergies-with-sparse-index (2021-09-09) 6 commits (merged to 'next' on 2021-09-12 at 1535fa2dae) + sparse-index: integrate with cherry-pick and rebase + sequencer: ensure full index if not ORT strategy + t1092: add cherry-pick, rebase tests + merge-ort: expand only for out-of-cone conflicts + merge: make sparse-aware with ORT + diff: ignore sparse paths in diffstat (this branch is used by ds/add-rm-with-sparse-index; uses ds/sparse-index-ignored-files.) Various mergy operations have been prepared to work efficiently with the sparse index. Will merge to 'master'. * js/run-command-close-packs (2021-09-09) 4 commits (merged to 'next' on 2021-09-12 at 97c3614c78) + Close object store closer to spawning child processes + run_auto_maintenance(): implicitly close the object store + run-command: offer to close the object store before running + run-command: prettify the `RUN_COMMAND_*` flags (this branch uses js/pull-release-packs-before-fetching.) The run-command API has been updated so that the callers can easily ask the file descriptors open for packfiles to be closed immediately before spawning commands that may trigger auto-gc. Will merge to 'master'. * jt/add-submodule-odb-clean-up (2021-09-09) 3 commits - revision: remove "submodule" from opt struct - repository: support unabsorbed in repo_submodule_init - submodule: remove unnecessary unabsorbed fallback (this branch uses jt/grep-wo-submodule-odb-as-alternate.) More code paths that uses the hack to add submodule's object database to the set of alternate object store have been cleaned up. * jx/ci-l10n (2021-09-09) 1 commit - ci: new github-action for git-l10n code review CI help for l10n. * jk/t5562-racefix (2021-09-09) 1 commit (merged to 'next' on 2021-09-12 at 22d4bfa14b) + t5562: use alarm() to interrupt timed child-wait Test update. Will merge to 'master'. * rs/no-mode-to-open-when-appending (2021-09-09) 1 commit (merged to 'next' on 2021-09-12 at a3ea25c5f1) + refs/files-backend: remove unused open mode parameter The "mode" word is useless in a call to open(2) that does not create a new file. Such a call in the files backend of the ref subsystem has been cleaned up. Will merge to 'master'. * rs/setup-use-xopen-and-xdup (2021-09-09) 1 commit (merged to 'next' on 2021-09-12 at 544b481d15) + setup: use xopen and xdup in sanitize_stdfds Code clean-up. Will merge to 'master'. * rs/use-xopen-in-index-pack (2021-09-10) 1 commit - index-pack: use xopen in init_thread * bs/install-strip (2021-09-05) 1 commit (merged to 'next' on 2021-09-08 at 40cfa71c8d) + make: add INSTALL_STRIP option variable "make INSTALL_STRIP=-s install" allows the installation step to use "install -s" to strip the binaries as they get installed. Will merge to 'master'. * cb/pedantic-build-for-developers (2021-09-03) 3 commits (merged to 'next' on 2021-09-10 at b8df102019) + developer: enable pedantic by default + win32: allow building with pedantic mode enabled + gettext: remove optional non-standard parens in N_() definition Update the build procedure to use the "-pedantic" build when DEVELOPER makefile macro is in effect. Will merge to 'master'. * js/scalar (2021-09-08) 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/. * ps/update-ref-batch-flush (2021-09-03) 1 commit (merged to 'next' on 2021-09-10 at 4ae19a5f34) + update-ref: fix streaming of status updates "git update-ref --stdin" failed to flush its output as needed, which potentially led the conversation to a deadlock. Will merge to 'master'. * ab/no-more-check-bindir (2021-09-07) 1 commit (merged to 'next' on 2021-09-08 at 4fddb3864f) + Makefile: remove the check_bindir script Build simplification. Will merge to 'master'. * ab/send-email-config-fix (2021-09-07) 1 commit (merged to 'next' on 2021-09-08 at c2000e9689) + send-email: fix a "first config key wins" regression in v2.33.0 Regression fix. Will merge to 'master'. * ab/tr2-leaks-and-fixes (2021-09-07) 6 commits (merged to 'next' on 2021-09-10 at 14f0dd5580) + tr2: log N parent process names on Linux + tr2: do compiler enum check in trace2_collect_process_info() + tr2: leave the parent list empty upon failure & don't leak memory + tr2: stop leaking "thread_name" memory + tr2: clarify TRACE2_PROCESS_INFO_EXIT comment under Linux + tr2: remove NEEDSWORK comment for "non-procfs" implementations The tracing of process ancestry information has been enhanced. Will merge to 'master'. * bs/doc-bugreport-outdir (2021-09-07) 1 commit (merged to 'next' on 2021-09-08 at 5ea3df204d) + Documentation: fix default directory of git bugreport -o Docfix. Will merge to 'master'. * jc/prefix-filename-allocates (2021-09-07) 1 commit (merged to 'next' on 2021-09-10 at a5221ea92e) + hash-object: prefix_filename() returns allocated memory these days Leakfix. Will merge to 'master'. * rs/range-diff-avoid-segfault-with-I (2021-09-07) 1 commit (merged to 'next' on 2021-09-10 at e8bac5f9ea) + range-diff: avoid segfault with -I "git range-diff -I... <range> <range>" segfaulted, which has been corrected. Will merge to 'master'. * so/diff-index-regression-fix (2021-09-07) 1 commit (merged to 'next' on 2021-09-08 at ca17912ed3) + diff-index: restore -c/--cc options handling Recent "diff -m" changes broke "gitk", which has been corrected. Will merge to 'master'. * tb/pack-finalize-ordering (2021-09-09) 9 commits (merged to 'next' on 2021-09-10 at 7b39c39e31) + pack-objects: rename .idx files into place after .bitmap files + pack-write: split up finish_tmp_packfile() function + builtin/index-pack.c: move `.idx` files into place last + index-pack: refactor renaming in final() + builtin/repack.c: move `.idx` files into place last + pack-write.c: rename `.idx` files after `*.rev` + pack-write: refactor renaming in finish_tmp_packfile() + bulk-checkin.c: store checksum directly + pack.h: line-wrap the definition of finish_tmp_packfile() The order in which various files that make up a single (conceptual) packfile has been reevaluated and straightened up. This matters in correctness, as an incomplete set of files must not be shown to a running Git. Will merge to 'master'. * ab/reverse-midx-optim (2021-09-07) 1 commit (merged to 'next' on 2021-09-08 at 1972c5931b) + pack-write: skip *.rev work when not writing *.rev The code that optionally creates the *.rev reverse index file has been optimized to avoid needless computation when it is not writing the file out. Will merge to 'master'. * ab/sanitize-leak-ci (2021-09-07) 3 commits - tests: add a test mode for SANITIZE=leak, run it in CI - CI: refactor "if" to "case" statement - Makefile: add SANITIZE=leak flag to GIT-BUILD-OPTIONS CI learns to run the leak sanitizer builds. Will merge to 'next'? * jc/trivial-threeway-binary-merge (2021-09-05) 1 commit (merged to 'next' on 2021-09-08 at d6ba0735d8) + apply: resolve trivial merge without hitting ll-merge with "--3way" The "git apply -3" code path learned not to bother the lower level merge machinery when the three-way merge can be trivially resolved without the content level merge. Will merge to 'master'. * 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. * pb/test-use-user-env (2021-09-07) 3 commits (merged to 'next' on 2021-09-08 at 6fa5d96723) + test-lib-functions: keep user's debugger config files and TERM in 'debug' + test-lib-functions: optionally keep HOME, TERM and SHELL in 'test_pause' + test-lib-functions: use 'TEST_SHELL_PATH' in 'test_pause' Teach "test_pause" and "debug" helpers to allow using the HOME and TERM environment variables the user usually uses. Will merge to 'master'. * 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. Will cook in 'next'. * mr/bisect-in-c-4 (2021-09-13) 6 commits - bisect--helper: retire `--bisect-next-check` subcommand - bisect--helper: reimplement `bisect_run` shell function in C - bisect--helper: reimplement `bisect_visualize()` shell function in C - run-command: make `exists_in_PATH()` non-static - t6030-bisect-porcelain: add test for bisect visualize - t6030-bisect-porcelain: add tests to control bisect run exit cases Rewrite of "git bisect" in C continues. Will merge to 'next'. * 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. What's the status of this one? * sg/test-split-index-fix (2021-09-07) 7 commits - read-cache: fix GIT_TEST_SPLIT_INDEX - tests: disable GIT_TEST_SPLIT_INDEX for sparse index tests - read-cache: look for shared index files next to the index, too - t1600-index: disable GIT_TEST_SPLIT_INDEX - t1600-index: don't run git commands upstream of a pipe - t1600-index: remove unnecessary redirection - Merge branch 'ds/sparse-index-ignored-files' into sg/test-split-index-fix (this branch uses ds/sparse-index-ignored-files.) Test updates. * ab/refs-errno-cleanup (2021-08-25) 4 commits - refs: make errno output explicit for refs_resolve_ref_unsafe - refs: explicitly return failure_errno from parse_loose_ref_contents - branch tests: test for errno propagating on failing read - refs: add failure_errno to refs_read_raw_ref() signature (this branch uses ab/refs-files-cleanup and hn/refs-errno-cleanup.) The "remainder" of hn/refs-errno-cleanup topic. * jv/pkt-line-batch (2021-09-01) 2 commits (merged to 'next' on 2021-09-10 at c31d871c9a) + upload-pack: use stdio in send_ref callbacks + pkt-line: add stdio packet write functions Reduce number of write(2) system calls while sending the ref advertisement. Will merge to 'master'. * ab/unbundle-progress (2021-09-07) 4 commits (merged to 'next' on 2021-09-12 at d7bacb391e) + bundle: show progress on "unbundle" + index-pack: add --progress-title option + bundle API: change "flags" to be "extra_index_pack_args" + bundle API: start writing API documentation Add progress display to "git bundle unbundle". Will merge to 'master'. * lh/systemd-timers (2021-09-07) 3 commits (merged to 'next' on 2021-09-10 at b27d72031a) + maintenance: add support for systemd timers on Linux + maintenance: `git maintenance run` learned `--scheduler=<scheduler>` + cache.h: Introduce a generic "xdg_config_home_for(…)" function "git maintenance" scheduler learned to use systemd timers as a possible backend. Will merge to 'master'. * ps/fetch-optim (2021-09-01) 7 commits (merged to 'next' on 2021-09-08 at 99f865125d) + fetch: avoid second connectivity check if we already have all objects + fetch: merge fetching and consuming refs + fetch: refactor fetch refs to be more extendable + fetch-pack: optimize loading of refs via commit graph + connected: refactor iterator to return next object ID directly + fetch: avoid unpacking headers in object existence check + fetch: speed up lookup of want refs via commit-graph Optimize code that handles large number of refs in the "git fetch" code path. Will merge to 'master'. * ar/submodule-run-update-procedure (2021-08-24) 1 commit (merged to 'next' on 2021-09-12 at fbe417715d) + submodule--helper: run update procedures from C Reimplementation of parts of "git submodule" in C continues. Will merge to 'master'. * ds/sparse-index-ignored-files (2021-09-07) 10 commits (merged to 'next' on 2021-09-12 at 6993c73000) + sparse-checkout: clear tracked sparse dirs + sparse-index: add SPARSE_INDEX_MEMORY_ONLY flag + attr: be careful about sparse directories + sparse-checkout: create helper methods + sparse-index: use WRITE_TREE_MISSING_OK + sparse-index: silently return when cache tree fails + unpack-trees: fix nested sparse-dir search + sparse-index: silently return when not using cone-mode patterns + t7519: rewrite sparse index test + Merge branch 'ds/add-with-sparse-index' into ds/sparse-index-ignored-files (this branch is used by ds/add-rm-with-sparse-index, ds/mergies-with-sparse-index and sg/test-split-index-fix.) In cone mode, the sparse-index codepath learned to remove ignored files (like build artifacts) outside the sparse cone, allowing the entire directory outside the sparse cone to be removed, which is especially useful when the sparse patterns change. Will merge to 'master'. * jt/grep-wo-submodule-odb-as-alternate (2021-09-08) 8 commits (merged to 'next' on 2021-09-08 at 67612d0b7f) + t7814: show lack of alternate ODB-adding + submodule-config: pass repo upon blob config read + grep: add repository to OID grep sources + grep: allocate subrepos on heap + grep: read submodule entry with explicit repo + grep: typesafe versions of grep_source_init + grep: use submodule-ODB-as-alternate lazy-addition + submodule: lazily add submodule ODBs as alternates (this branch is used by jt/add-submodule-odb-clean-up.) The code to make "git grep" recurse into submodules has been updated to migrate away from the "add submodule's object store as an alternate object store" mechanism (which is suboptimal). Will merge to 'master'. * ar/submodule-add-more (2021-08-10) 10 commits (merged to 'next' on 2021-09-12 at efebf6dad3) + submodule--helper: rename compute_submodule_clone_url() + submodule--helper: remove resolve-relative-url subcommand + submodule--helper: remove add-config subcommand + submodule--helper: remove add-clone subcommand + submodule--helper: convert the bulk of cmd_add() to C + dir: libify and export helper functions from clone.c + submodule--helper: remove repeated code in sync_submodule() + submodule--helper: refactor resolve_relative_url() helper + submodule--helper: add options for compute_submodule_clone_url() + Merge branch 'ar/submodule-add-config' into ar/submodule-add (this branch uses ar/submodule-add-config.) More parts of "git submodule add" has been rewritten in C. Will merge to 'master'. * ab/lib-subtest (2021-08-05) 11 commits - 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: assert no copy/pasted mock test code - test-lib tests: get rid of copy/pasted mock test code - test-lib tests: don't provide a description for the sub-tests - test-lib tests: stop using a subshell in write_sub_test_lib_test() - 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/only-single-progress-at-once (2021-07-23) 8 commits - progress.c: add & assert a "global_progress" variable - pack-bitmap-write.c: add a missing stop_progress() - progress.c: add temporary variable from progress struct - progress.c: stop eagerly fflush(stderr) when not a terminal - 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 Further tweaks on progress API. On hold. cf. <20210901050406.GB76263@xxxxxxxxxx> * ab/progress-users-adjust-counters (2021-09-09) 2 commits (merged to 'next' on 2021-09-10 at b50c37aa44) + entry: show finer-grained counter in "Filtering content" progress line + commit-graph: fix bogus counter in "Scanning merged commits" progress line The code to show progress indicator in a few codepaths did not cover between 0-100%, which has been corrected. Will merge to 'master'. * ar/submodule-add-config (2021-08-10) 1 commit (merged to 'next' on 2021-09-12 at fdabb4f0fc) + submodule--helper: introduce add-config subcommand (this branch is used by ar/submodule-add-more.) Large part of "git submodule add" gets rewritten in C. Will merge to 'master'. * dt/submodule-diff-fixes (2021-08-31) 3 commits (merged to 'next' on 2021-09-10 at 21b773f4fe) + diff --submodule=diff: don't print failure message twice + diff --submodule=diff: do not fail on ever-initialied deleted submodules + t4060: remove unused variable "git diff --submodule=diff" showed failure from run_command() when trying to run diff inside a submodule, when the user manually removes the submodule directory. Will merge to 'master'. * fs/ssh-signing (2021-09-10) 9 commits - 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 Use ssh public crypto for object and push-cert signing. On hold. cf. <pull.1041.v8.git.git.1631304462.gitgitgadget@xxxxxxxxx> cf. <532d97e7-8c91-df6a-6d90-70668256f513@xxxxxxxxxxxx> * 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> * ab/make-tags-cleanup (2021-08-05) 5 commits (merged to 'next' on 2021-09-12 at 79584f3c60) + Makefile: normalize clobbering & xargs for tags targets + Makefile: remove "cscope.out", not "cscope*" in cscope.out target + Makefile: don't use "FORCE" for tags targets + Makefile: add QUIET_GEN to "cscope" target + Makefile: move ".PHONY: cscope" near its target Build clean-up for "make tags" and friends. Will merge to 'master'. * tb/multi-pack-bitmaps (2021-09-09) 29 commits (merged to 'next' on 2021-09-10 at 71559ef435) + pack-bitmap: drop bitmap_index argument from try_partial_reuse() + pack-bitmap: drop repository argument from prepare_midx_bitmap_git() (merged to 'next' on 2021-09-08 at f2b7415bd8) + p5326: perf tests for MIDX bitmaps + p5310: extract full and partial bitmap tests + midx: respect 'GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP' + t7700: update to work with MIDX bitmap test knob + t5319: don't write MIDX bitmaps in t5319 + t5310: disable GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP + t0410: disable GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP + t5326: test multi-pack bitmap behavior + t/helper/test-read-midx.c: add --checksum mode + t5310: move some tests to lib-bitmap.sh + pack-bitmap: write multi-pack bitmaps + pack-bitmap: read multi-pack bitmaps + pack-bitmap.c: avoid redundant calls to try_partial_reuse + pack-bitmap.c: introduce 'bitmap_is_preferred_refname()' + pack-bitmap.c: introduce 'nth_bitmap_object_oid()' + pack-bitmap.c: introduce 'bitmap_num_objects()' + midx: avoid opening multiple MIDXs when writing + midx: close linked MIDXs, avoid leaking memory + midx: infer preferred pack when not given one + midx: reject empty `--preferred-pack`'s + midx: clear auxiliary .rev after replacing the MIDX + midx: fix `*.rev` cleanups with `--object-dir` + midx: disallow running outside of a repository + Documentation: describe MIDX-based bitmaps + pack-bitmap-write.c: free existing bitmaps + pack-bitmap-write.c: gracefully fail to write non-closed bitmaps + pack-bitmap.c: harden 'test_bitmap_walk()' to check type bitmaps (this branch is used by tb/midx-write-propagate-namehash and tb/repack-write-midx.) The reachability bitmap file used to be generated only for a single pack, but now we've learned to generate bitmaps for history that span across multiple packfiles. Will merge to 'master'. * ab/config-based-hooks-base (2021-09-09) 36 commits - hooks: fix a TOCTOU in "did we run a hook?" heuristic - receive-pack: convert receive hooks to hook.h - post-update: use hook.h library - receive-pack: convert 'update' hook to hook.h - hooks: allow callers to capture output - run-command: allow capturing of collated output - reference-transaction: use hook.h to run hooks - hook tests: use a modern style for "pre-push" tests - hook tests: test for exact "pre-push" hook input - transport: convert pre-push hook to hook.h - hook: convert 'post-rewrite' hook in sequencer.c to hook.h - hook: provide stdin by string_list or callback - run-command: add stdin callback for parallelization - am: convert 'post-rewrite' hook to hook.h - hook: support passing stdin to hooks - run-command: allow stdin for run_processes_parallel - 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 - 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: stop hardcoding {command,config}-list.h - Makefile: mark "check" target as .PHONY (this branch is used by es/config-based-hooks.) Restructuring of (a subset of) Emily's config-based-hooks series, to demonstrate that a series can be presented as a more logical and focused progression. Waiting for reviews. * ab/serve-cleanup (2021-08-05) 10 commits (merged to 'next' on 2021-09-12 at ea87ede873) + upload-pack: document and rename --advertise-refs + serve.[ch]: remove "serve_options", split up --advertise-refs code + {upload,receive}-pack tests: add --advertise-refs tests + serve.c: move version line to advertise_capabilities() + serve: move transfer.advertiseSID check into session_id_advertise() + serve.[ch]: don't pass "struct strvec *keys" to commands + serve: use designated initializers + transport: use designated initializers + transport: rename "fetch" in transport_vtable to "fetch_refs" + serve: mark has_capability() as static Code clean-up around "git serve". Will merge to 'master'. * 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> * hn/reftable (2021-09-10) 20 commits - fixup! reftable: implement stack, a mutable database of reftable files. - 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: RFC: add LICENSE - hash.h: provide constants for the hash IDs The "reftable" backend for the refs API, without integrating into the refs subsystem. * ab/refs-files-cleanup (2021-08-25) 13 commits - refs/files: remove unused "errno != ENOTDIR" condition - refs/files: remove unused "errno == EISDIR" code - refs/files: remove unused "oid" in lock_ref_oid_basic() - refs API: remove OID argument to reflog_expire() - reflog expire: don't lock reflogs using previously seen OID - refs/files: add a comment about refs_reflog_exists() call - refs: make repo_dwim_log() accept a NULL oid - refs/debug: re-indent argument list for "prepare" - refs/files: remove unused "skip" in lock_raw_ref() too - refs/files: remove unused "extras/skip" in lock_ref_oid_basic() - refs: drop unused "flags" parameter to lock_ref_oid_basic() - refs/files: remove unused REF_DELETING in lock_ref_oid_basic() - refs/packet: add missing BUG() invocations to reflog callbacks (this branch is used by ab/refs-errno-cleanup and hn/refs-errno-cleanup.) Continued work on top of the hn/refs-errno-cleanup topic. * hn/refs-errno-cleanup (2021-08-25) 4 commits - refs: make errno output explicit for read_raw_ref_fn - refs/files-backend: stop setting errno from lock_ref_oid_basic - refs: remove EINVAL errno output from specification of read_raw_ref_fn - refs file backend: move raceproof_create_file() here (this branch is used by ab/refs-errno-cleanup; uses ab/refs-files-cleanup.) Futz with the way 'errno' is relied on in the refs API to carry the failure modes up the callchain. -------------------------------------------------- [Discarded] * np/blame-ignore-revs-file-may-be-optional (2021-08-09) 1 commit . blame: add config `blame.ignoreRevsFileIsOptional` When the file named by blame.ignoreRevsFile configuration variable does not exist, it causes "git blame" to die. Sometimes, it is useful if the files named by configuration variables can be made optional (it would allow ~/.gitconfig to give a filename, and make it effective only in repositories that have a file with that name). This uses an extra variable that marks that the variable is optional. Yet another alternative is being discussed to define syntax for "optional" filename values, so that the same mechanism can be used for not just blame.ignoreRevsFile but other filenames. Queued just as a reminder of the theme. * ab/test-tool-cache-cleanup (2021-08-24) 4 commits . read-cache perf: add a perf test for refresh_index() . test-tool: migrate read-cache-again to parse_options() . test-tool: migrate read-cache-perf to parse_options() . test-tool: split up test-tool read-cache Test code shuffling. Discarded. cf. <87tuj7xhqo.fsf@xxxxxxxxxxxxxxxxxxx> * ow/clone-bare-origin (2021-08-03) 1 commit . clone: Allow combining --bare and --origin "git clone" did not like to take "--bare" and "--origin=X" at the same time; loosen the restriction. cf. <20210802174944.53745-1-oystwa@xxxxxxxxx> * jk/http-backend-handle-proto-header (2021-09-09) 1 commit . http-backend: handle HTTP_GIT_PROTOCOL CGI variable Taking advantage of the CGI interface, http-backend has been updated to enable protocol v2 automatically when the other side asks for it. Discarded. The jk/http-server-protocol-versions topic supersedes this. * kr/doc-webserver-config-for-v2 (2021-09-07) 1 commit . Docs: web server must setenv GIT_PROTOCOL for v2 Hints to set GIT_PROTOCOL environment in various CGI environments are added to the documentation. Discarded. The jk/http-server-protocol-versions topic supersedes this.
