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', and aren't considered "accepted" at all. A topic without enough support may be discarded after a long period of no activity. A large-ish handful of topics are awaiting review. I'll continue to hold those topics in 'seen' until they have enough attention to feel comfortable merging them down. 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: https://github.com/git/git/ The following mirrors are currently out-of-date while the usual maintainer is offline. 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://gitlab.com/git-vcs/git/ With all the integration branches and topics broken out: https://github.com/ttaylorr/git/ Even though the preformatted documentation in HTML and man format are not sources, they are typically 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/ ...but these and the release tarballs below are similarly out-of-date: https://www.kernel.org/pub/software/scm/git/ -------------------------------------------------- [New Topics] * ab/submodule-helper-prep-only (2022-11-02) 8 commits - submodule--helper: use OPT_SUBCOMMAND() API - submodule--helper: drop "update --prefix <pfx>" for "-C <pfx> update" - submodule--helper: remove --prefix from "absorbgitdirs" - submodule API & "absorbgitdirs": remove "----recursive" option - submodule.c: refactor recursive block out of absorb function - submodule tests: test for a "foreach" blind-spot - submodule tests: add tests for top-level flag output - submodule--helper: move "config" to a test-tool Preparation to remove git-submodule.sh and replace it with a builtin. Waiting for review? source: <cover-0.8-00000000000-20221102T074148Z-avarab@xxxxxxxxx> * ds/bundle-uri-4 (2022-10-31) 9 commits - clone: unbundle the advertised bundles - bundle-uri: download bundles from an advertised list - bundle-uri: allow relative URLs in bundle lists - strbuf: reintroduce strbuf_parent_directory() - bundle-uri client: add boolean transfer.bundleURI setting - bundle-uri: serve bundle.* keys from config - bundle-uri client: add helper for testing server - bundle-uri client: add minimal NOOP client - protocol v2: add server-side "bundle-uri" skeleton Bundle URIs part 4. source: <pull.1400.git.1667264854.gitgitgadget@xxxxxxxxx> * jk/ref-filter-parsing-bugs (2022-11-02) 2 commits (merged to 'next' on 2022-11-03 at 92c1a50548) + ref-filter: fix parsing of signatures with CRLF and no body + ref-filter: fix parsing of signatures without blank lines Various tests exercising the transfer.credentialsInUrl configuration are taught to avoid making requests which require resolving localhost to reduce CI-flakiness. Will merge to 'master'. source: <Y2IeqOT5Ao1Qa0Zl@xxxxxxxxxxxxxxxxxxxxxxx> * ma/drop-redundant-diagnostic (2022-10-31) 1 commit (merged to 'next' on 2022-11-03 at 196c5a337b) + test-lib-functions: drop redundant diagnostic print A redundant diagnostic message is dropped from test_path_is_missing(). Will merge to 'master'. source: <20221031180048.5766-1-martin.agren@xxxxxxxxx> * sg/plug-line-log-leaks (2022-11-02) 3 commits - diff.c: use diff_free_queue() - line-log: free the diff queues' arrays when processing merge commits - line-log: free diff queue when processing non-merge commits A handful of leaks in the line-log machinery have been plugged. Expecting a reroll. source: <20221102220142.574890-1-szeder.dev@xxxxxxxxx> * tb/branch-delete-detached (2022-11-01) 1 commit - branch: gracefully handle '-d' on detached HEAD 'git branch -d' is taught to ignore failures to resolve HEAD when detached. Expecting a reroll. source: <c68f4b140f2495a35c5f30bec4e2e56c246160f4.1667334672.git.me@xxxxxxxxxxxx> * tb/howto-maintain-git-fixes (2022-10-31) 2 commits - Documentation: build redo-seen.sh from jch..seen - Documentation: build redo-jch.sh from master..jch (this branch uses tb/howto-using-redo-script.) A pair of bugfixes to the Documentation/howto/maintain-git.txt guide. Will merge to 'next'. source: <cover.1667260044.git.me@xxxxxxxxxxxx> * tl/pack-bitmap-absolute-paths (2022-11-02) 1 commit - pack-bitmap.c: avoid exposing absolute paths The pack-bitmap machinery is taught to log the paths of redundant bitmap(s) to trace2 instead of stderr. Expecting a reroll. source: <87a494e5ac0cc992689944ab13600d097c51e54a.1667393419.git.dyroneteng@xxxxxxxxx> -------------------------------------------------- [Stalled] * cw/submodule-status-in-parallel (2022-10-20) 7 commits . diff-lib: parallelize run_diff_files for submodules . diff-lib: refactor match_stat_with_submodule . submodule: move status parsing into function . submodule: strbuf variable rename . run-command: add hide_output to run_processes_parallel_opts . run-command: add pipe_output_fn to run_processes_parallel_opts . Merge branch 'ab/run-hook-api-cleanup' into cw/submodule-status-in-parallel Allow the internal "diff-files" engine to run "how has this submodule changed?" in parallel to speed up "git status". Breaks winVS test? cf. <https://github.com/git/git/actions/runs/3298596454/jobs/5441029092> source: <20221011232604.839941-1-calvinwan@xxxxxxxxxx> * js/bisect-in-c (2022-08-30) 17 commits . bisect: no longer try to clean up left-over `.git/head-name` files . bisect: remove Cogito-related code . Turn `git bisect` into a full built-in . bisect: move even the command-line parsing to `bisect--helper` . bisect--helper: make `state` optional . bisect--helper: calling `bisect_state()` without an argument is a bug . bisect: avoid double-quoting when printing the failed command . bisect run: fix the error message . bisect: verify that a bogus option won't try to start a bisection . bisect--helper: migrate to OPT_SUBCOMMAND() . bisect--helper: make the order consistently `argc, argv` . bisect--helper: make `terms` an explicit singleton . bisect--helper: simplify exit code computation . bisect--helper: really retire `--bisect-autostart` . bisect--helper: really retire --bisect-next-check . bisect--helper: retire the --no-log option . Merge branch 'sg/parse-options-subcommand' into js/bisect-in-c Final bits of "git bisect.sh" have been rewritten in C. Needs review. cf. <xmqqv8pr8903.fsf@gitster.g> source: <pull.1132.v6.git.1661885419.gitgitgadget@xxxxxxxxx> * od/ci-use-checkout-v3-when-applicable (2022-10-10) 2 commits . ci(main): linux32 uses actions/checkout@v2 . ci(main): upgrade actions/checkout to v3 Attempt to update GitHub CI to use actions/checkout@v3 Expecting a reroll. Seems to break the CI completely. source: <pull.1354.git.git.1665388136.gitgitgadget@xxxxxxxxx> * ed/fsmonitor-inotify (2022-10-14) 7 commits . fsmonitor: update doc for Linux . fsmonitor: test updates . fsmonitor: enable fsmonitor for Linux . fsmonitor: implement filesystem change listener for Linux . fsmonitor: determine if filesystem is local or remote . fsmonitor: prepare to share code between Mac OS and Linux . Merge branch 'ed/fsmonitor-on-networked-macos' into ed/fsmonitor-inotify Bundled fsmonitor for Linux using inotify API. Needs review. Occasional breakages of t7527.16? source: <pull.1352.v2.git.git.1665783944.gitgitgadget@xxxxxxxxx> * ag/merge-strategies-in-c (2022-08-10) 14 commits . sequencer: use the "octopus" strategy without forking . sequencer: use the "resolve" strategy without forking . merge: use the "octopus" strategy without forking . merge: use the "resolve" strategy without forking . merge-octopus: rewrite in C . merge-recursive: move better_branch_name() to merge.c . merge-resolve: rewrite in C . merge-one-file: rewrite in C . update-index: move add_cacheinfo() to read-cache.c . merge-index: add a new way to invoke `git-merge-one-file' . merge-index: drop the index . merge-index: libify merge_one_path() and merge_all() . t6060: add tests for removed files . t6060: modify multiple files to expose a possible issue with merge-index An attempt to rewrite remaining merge strategies from shell to C. Needs more work. At the minimum, we should lose 11/14 and possibly 08/14. cf. <xmqq7d36vfur.fsf@gitster.g> source: <20220809185429.20098-1-alban.gruin@xxxxxxxxx> * es/doc-creation-factor-fix (2022-07-28) 2 commits . range-diff: clarify --creation-factor=<factor> . format-patch: clarify --creation-factor=<factor> Expecting a reroll by somebody more familiar with the logic cf. <xmqqo7wfix7p.fsf@gitster.g> source: <7229p500-p2r4-on87-6802-8o90s36rr3s4@xxxxxx> * cw/remote-object-info (2022-08-13) 7 commits . SQUASH??? . cat-file: add remote-object-info to batch-command . transport: add client support for object-info . serve: advertise object-info feature . protocol-caps: initialization bug fix . fetch-pack: move fetch initialization . fetch-pack: refactor packet writing A client component to talk with the object-info endpoint. Expecting a reroll. Under SANITIZE=address, t1006-cat-file.sh finds a breakage. cf. <20220728230210.2952731-1-calvinwan@xxxxxxxxxx> cf. <CAFySSZDvgwbbHCHfyuaqX3tKsr-GjJ9iihygg6rNNe46Ys7_EA@xxxxxxxxxxxxxx> source: <20220728230210.2952731-1-calvinwan@xxxxxxxxxx> -------------------------------------------------- [Cooking] * ab/cmake-nix-and-ci (2022-11-02) 12 commits - CI: add a "linux-cmake-test" to run cmake & ctest on linux - cmake: copy over git-p4.py for t983[56] perforce test - cmake: support GIT_TEST_OPTS, abstract away WIN32 defaults - Makefile + cmake: use environment, not GIT-BUILD-DIR - test-lib.sh: support a "GIT_TEST_BUILD_DIR" - cmake: set "USE_LIBPCRE2" in "GIT-BUILD-OPTIONS" for test-lib.sh - cmake & test-lib.sh: add a $GIT_SOURCE_DIR variable - cmake: chmod +x the bin-wrappers/* & SCRIPT_{SH,PERL} & git-p4 - cmake: don't copy chainlint.pl to build directory - cmake: update instructions for portable CMakeLists.txt - cmake: don't "mkdir -p" and "cd" in build instructions - cmake: increase test timeout on Windows only Fix assorted issues with CTest on *nix machines. Waiting for review. source: <cover-v3-00.12-00000000000-20221101T225022Z-avarab@xxxxxxxxx> * ab/make-bin-wrappers (2022-10-31) 4 commits - Makefile: simplify $(test_bindir_programs) rule by splitting it up - Makefile: rename "test_bindir_programs" variable, pre-declare - Makefile: define "TEST_{PROGRAM,OBJS}" variables earlier - Makefile: factor sed-powered '#!/bin/sh' munging into a variable Resolve issues with the bin-wrappers/% rules where "make bin-wrappers/git" would generate the script but not "git" itself. Waiting for review. source: <cover-v3-0.4-00000000000-20221031T222249Z-avarab@xxxxxxxxx> * ab/misc-hook-submodule-run-command (2022-10-31) 3 commits (merged to 'next' on 2022-11-03 at 0f01b25561) + run-command tests: test stdout of run_command_parallel() + submodule tests: reset "trace.out" between "grep" invocations + hook tests: fix redirection logic error in 96e7225b310 Various test updates. Waiting for review. source: <cover-0.3-00000000000-20221029T025520Z-avarab@xxxxxxxxx> * do/modernize-t7001 (2022-10-31) 1 commit - t7001-mv.sh:modernizing test script using function Modernize test script to avoid "test -f" and friends. Will merge to 'next'. source: <pull.1372.git.git.1667150441883.gitgitgadget@xxxxxxxxx> * kz/merge-tree-merge-base (2022-11-01) 2 commits - merge-tree.c: support --merge-base in conjunction with --stdin - merge-tree.c: add --merge-base=<commit> option "merge-tree" learns a new `--merge-base` option. Waiting for review. source: <pull.1397.v4.git.1667292904.gitgitgadget@xxxxxxxxx> * mh/password-can-be-pat (2022-11-02) 1 commit - Mention that password could be a personal access token. Documentation update to git-credential(1). Will merge to 'next'. source: <pull.1396.v2.git.1667385022103.gitgitgadget@xxxxxxxxx> * po/pretty-hard-trunc (2022-11-02) 1 commit - pretty-formats: add hard truncation, without ellipsis, options Add a new pretty format which truncates without ellipsis. Missing test coverage. source: <20221102120853.2013-1-philipoakley@iee.email> * rr/long-status-advice (2022-10-31) 1 commit - status: long status advice adapted to recent capabilities The advice message emitted by a slow "status" run is amended to mention fsmonitor. Waiting for reviewer feedback on the updated round. source: <pull.1384.v2.git.1667002005494.gitgitgadget@xxxxxxxxx> * rs/archive-filter-error-once (2022-10-30) 1 commit (merged to 'next' on 2022-11-03 at c2d1004d96) + archive-tar: report filter start error only once "git archive" mistakenly complained twice about a missing executable, which has been corrected. Will merge to 'master'. source: <c51b72e5-1c32-65e4-6faa-04693b623e2e@xxxxxx> * ab/config-multi-and-nonbool (2022-11-02) 9 commits - for-each-repo: with bad config, don't conflate <path> and <cmd> - config API: add "string" version of *_value_multi(), fix segfaults - config API users: test for *_get_value_multi() segfaults - for-each-repo: error on bad --config - config API: have *_multi() return an "int" and take a "dest" - versioncmp.c: refactor config reading next commit - config tests: add "NULL" tests for *_get_value_multi() - config tests: cover blind spots in git_die_config() tests - for-each-repo tests: test bad --config keys A mixed bag of config API updates. Expecting a reroll. cf. <221026.86pmeebcj9.gmgdl@xxxxxxxxxxxxxxxxxxx> source: <cover-v2-0.9-00000000000-20221101T225822Z-avarab@xxxxxxxxx> * ab/sha-makefile-doc (2022-10-26) 9 commits - Makefile: discuss SHAttered in *_SHA{1,256} discussion - Makefile: document default SHA-1 backend on OSX - Makefile: document SHA-1 and SHA-256 default and selection order - Makefile: document default SHA-256 backend - Makefile: rephrase the discussion of *_SHA1 knobs - Makefile: create and use sections for "define" flag listing - Makefile: correct DC_SHA1 documentation - INSTALL: remove discussion of SHA-1 backends - Makefile: always (re)set DC_SHA1 on fallback Makefile comments updates and reordering to clarify knobs used to choose SHA implementations. Will merge to 'next'? source: <cover-v4-0.9-00000000000-20221026T145255Z-avarab@xxxxxxxxx> * rs/no-more-run-command-v (2022-10-30) 12 commits (merged to 'next' on 2022-11-03 at 27eb80811c) + replace and remove run_command_v_opt() + replace and remove run_command_v_opt_cd_env_tr2() + replace and remove run_command_v_opt_tr2() + replace and remove run_command_v_opt_cd_env() + use child_process members "args" and "env" directly + use child_process member "args" instead of string array variable + sequencer: simplify building argument list in do_exec() + bisect--helper: factor out do_bisect_run() + bisect: simplify building "checkout" argument list + am: simplify building "show" argument list + run-command: fix return value comment + merge: remove always-the-same "verbose" arguments Simplify the run-command API. Will merge to 'master'. source: <ea061164-b36b-485c-963f-8c13e813a47e@xxxxxx> * tb/howto-using-redo-script (2022-10-26) 1 commit (merged to 'next' on 2022-11-03 at 521600fd56) + Documentation/howto/maintain-git.txt: fix Meta/redo-jch.sh invocation (this branch is used by tb/howto-maintain-git-fixes.) Doc update. Will merge to 'master'. source: <4ba057094ae6b1bd5c18583f23f7f99232034c72.1666815325.git.me@xxxxxxxxxxxx> * ps/receive-use-only-advertised (2022-10-28) 3 commits - SQUASH - leakfix - receive-pack: use advertised reference tips to inform connectivity check - connected: allow supplying different view of reachable objects "git receive-pack" used to use all the local refs as the boundary for checking connectivity of the data "git push" sent, but now it uses only the refs that it advertised to the pusher. In a repository with the .hideRefs configuration, this reduces the resource needed to perform the check, and also forces the pusher to prove they have all objects that are necessary to complete the history on top of only the history available to them. Expecting a reroll. cf. <221028.86bkpw805n.gmgdl@xxxxxxxxxxxxxxxxxxx> cf. <xmqqr0yrizqm.fsf@gitster.g> source: <cover.1666967670.git.ps@xxxxxx> * jc/set-gid-bit-less-aggressively (2022-10-28) 1 commit (merged to 'next' on 2022-11-03 at 32bfd99ffd) + adjust_shared_perm(): leave g+s alone when the group does not matter The adjust_shared_perm() helper function learned to refrain from setting the "g+s" bit on directories when it is not necessary. Will merge to 'master'. source: <xmqqr0yrhco6.fsf@gitster.g> * gc/submodule-clone-update-with-branches (2022-10-30) 8 commits - clone, submodule update: create and check out branches - submodule--helper: remove update_data.suboid - submodule update: refactor update targets - submodule: return target of submodule symref - t5617: drop references to remote-tracking branches - submodule--helper clone: create named branch - repo-settings: add submodule_propagate_branches - clone: teach --detach option "git clone --recurse-submodules" and "git submodule update" learns to honor the "propagete branches" option. Waiting for review. source: <pull.1321.v3.git.git.1666988096.gitgitgadget@xxxxxxxxx> * es/mark-gc-cruft-as-experimental (2022-10-26) 2 commits (merged to 'next' on 2022-11-03 at 4079e1b06b) + config: let feature.experimental imply gc.cruftPacks=true + gc: add tests for --cruft and friends Enable gc.cruftpacks by default for those who opt into feature.experimental setting. Will merge to 'master'. source: <cover.1666819953.git.me@xxxxxxxxxxxx> * pw/config-int-parse-fixes (2022-10-22) 3 commits . git_parse_signed(): avoid integer overflow . config: require at least one digit when parsing numbers . git_parse_unsigned: reject negative values Assorted fixes of parsing end-user input as integers. Expecting a reroll to add test coverage. cf. <Y1L+Qv+cs1bjqjK9@xxxxxxxxxxxxxxxxxxxxxxx> source: <pull.1389.git.1666359915.gitgitgadget@xxxxxxxxx> * sa/cat-file-mailmap (2022-10-21) 1 commit . doc/cat-file: allow --use-mailmap for --batch options Doc updates. Waiting for review response. source: <20221021103442.202759-1-siddharthasthana31@xxxxxxxxx> * tb/repack-expire-to (2022-10-24) 4 commits . builtin/repack.c: implement `--expire-to` for storing pruned objects . builtin/repack.c: write cruft packs to arbitrary locations . builtin/repack.c: pass "cruft_expiration" to `write_cruft_pack` . builtin/repack.c: pass "out" to `prepare_pack_objects` "git repack" learns to send cruft objects out of the way into packfiles outside the repository. Waiting for review. source: <cover.1666636974.git.me@xxxxxxxxxxxx> * cc/filtered-repack (2022-10-25) 2 commits . repack: add --filter=<filter-spec> option . pack-objects: allow --filter without --stdout "git repack" learns to discard objects that ought to be retrievable again from the promissor remote. Needs review. source: <20221025122856.20204-1-christian.couder@xxxxxxxxx> * al/trace2-clearing-skip-worktree (2022-10-31) 2 commits - SQUASH??? - index: add trace2 region for clear skip worktree Add trace2 counters to the region to clear skip worktree bits in a sparse checkout. Expecting a reroll? source: <pull.1368.v3.git.git.1667177791591.gitgitgadget@xxxxxxxxx> * po/glossary-around-traversal (2022-10-30) 4 commits (merged to 'next' on 2022-11-03 at 58b659f92b) + glossary: add reachability bitmap description + glossary: add "commit graph" description + doc: use 'object database' not ODB or abbreviation + doc: use "commit-graph" hyphenation consistently The glossary entries for "commit-graph file" and "reachability bitmap" have been added. Will merge to 'master'. source: <20221029164112.2097-1-philipoakley@iee.email> * mc/credential-helper-auth-headers (2022-11-02) 11 commits - t5556: add HTTP authentication tests - test-http-server: add simple authentication - test-http-server: pass Git requests to http-backend - test-http-server: add HTTP request parsing - test-http-server: add HTTP error response function - test-http-server: add stub HTTP server test helper - http: set specific auth scheme depending on credential - http: move proactive auth to first slot creation - http: store all request headers on active_request_slot - credential: add WWW-Authenticate header to cred requests - http: read HTTP WWW-Authenticate response headers Extending credential helper protocol. Needs review. source: <pull.1352.v3.git.1667426969.gitgitgadget@xxxxxxxxx> * hl/archive-recursive (2022-10-19) 10 commits . fixup! archive: add tests for git archive --recurse-submodules . archive: add tests for git archive --recurse-submodules . archive: add --recurse-submodules to git-archive command . archive: remove global repository from archive_args . archive: pass repo objects to write_archive handlers . tree: add repository parameter to read_tree_fn_t . tree: handle submodule case for read_tree_at properly . tree: increase test coverage for tree.c . tree: update cases to use repo_ tree methods . tree: do not use the_repository for tree traversal methods. "git archive" has been taught "--recurse-submodules" option to create a tarball that includes contents from submodules. Expecting a reroll. Seems to break win+VS test(8). cf. https://github.com/git/git/actions/runs/3293333066 whose only difference from https://github.com/git/git/actions/runs/3293553109 is the inclusion of this topic. source: <pull.1359.v3.git.git.1665973401.gitgitgadget@xxxxxxxxx> * en/sparse-checkout-design (2022-10-08) 1 commit . sparse-checkout.txt: new document with sparse-checkout directions Design doc. Needs review. source: <pull.1367.v3.git.1665269538608.gitgitgadget@xxxxxxxxx> * pw/test-todo (2022-10-06) 3 commits . test_todo: allow [verbose] test as the command . test_todo: allow [!] grep as the command . tests: add test_todo() to mark known breakages RFC for test framework improvement. Needs review. source: <pull.1374.git.1665068476.gitgitgadget@xxxxxxxxx> * ab/coccicheck-incremental (2022-11-02) 13 commits - spatchcache: add a ccache-alike for "spatch" - cocci: run against a generated ALL.cocci - cocci rules: remove <id>'s from rules that don't need them - Makefile: copy contrib/coccinelle/*.cocci to build/ - cocci: optimistically use COMPUTE_HEADER_DEPENDENCIES - cocci: make "coccicheck" rule incremental - cocci: split off "--all-includes" from SPATCH_FLAGS - cocci: split off include-less "tests" from SPATCH_FLAGS - Makefile: split off SPATCH_BATCH_SIZE comment from "cocci" heading - Makefile: have "coccicheck" re-run if flags change - Makefile: add ability to TAB-complete cocci *.patch rules - cocci rules: remove unused "F" metavariable from pending rule - Makefile + shared.mak: rename and indent $(QUIET_SPATCH_T) "make coccicheck" is time consuming. It has been made to run more incrementally. Will merge to 'next'? source: <cover-v5-00.13-00000000000-20221101T222616Z-avarab@xxxxxxxxx>
