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 few more topics have been merged to the 'master' branch. We plan to tag -rc1 in a few days (but expect no movement on 'master' or 'next' tomorrow). There are a few topics that are marked with the "Merge to 'next'?" marker, which can use your help ;-) After -rc1 gets tagged, the 'master' branch will go in the "regression fixes only" mode (cf. https://tinyurl.com/gitCal). Copies of the source code to Git live in many repositories, and the following is a list of the ones I push into or their mirrors. Some repositories have only a subset of branches. With maint, master, next, seen, todo: git://git.kernel.org/pub/scm/git/git.git/ git://repo.or.cz/alt-git.git/ https://kernel.googlesource.com/pub/scm/git/git/ https://github.com/git/git/ https://gitlab.com/git-vcs/git/ With all the integration branches and topics broken out: https://github.com/gitster/git/ Even though the preformatted documentation in HTML and man format are not sources, they are published in these repositories for convenience (replace "htmldocs" with "manpages" for the manual pages): git://git.kernel.org/pub/scm/git/git-htmldocs.git/ https://github.com/gitster/git-htmldocs.git/ Release tarballs are available at: https://www.kernel.org/pub/software/scm/git/ -------------------------------------------------- [Graduated to 'master'] * ad/t1800-cygwin (2022-09-15) 1 commit (merged to 'next' on 2022-09-15 at 9667abb48c) + t1800: correct test to handle Cygwin Test fix. source: <20220915075717.425673-1-adam@xxxxxxxxxxxxx> * es/chainlint (2022-09-12) 19 commits (merged to 'next' on 2022-09-12 at 577e59143f) + chainlint: colorize problem annotations and test delimiters (merged to 'next' on 2022-09-08 at eab3357b05) + t: retire unused chainlint.sed + t/Makefile: teach `make test` and `make prove` to run chainlint.pl + test-lib: replace chainlint.sed with chainlint.pl + test-lib: retire "lint harder" optimization hack + t/chainlint: add more chainlint.pl self-tests + chainlint.pl: allow `|| echo` to signal failure upstream of a pipe + chainlint.pl: complain about loops lacking explicit failure handling + chainlint.pl: don't flag broken &&-chain if failure indicated explicitly + chainlint.pl: don't flag broken &&-chain if `$?` handled explicitly + chainlint.pl: don't require `&` background command to end with `&&` + t/Makefile: apply chainlint.pl to existing self-tests + chainlint.pl: don't require `return|exit|continue` to end with `&&` + chainlint.pl: validate test scripts in parallel + chainlint.pl: add parser to identify test definitions + chainlint.pl: add parser to validate tests + chainlint.pl: add POSIX shell parser + chainlint.pl: add POSIX shell lexical analyzer + t: add skeleton chainlint.pl Revamp chainlint script for our tests. source: <pull.1322.git.git.1661992197.gitgitgadget@xxxxxxxxx> source: <pull.1324.git.git.1663023888412.gitgitgadget@xxxxxxxxx> * jk/list-objects-filter-cleanup (2022-09-12) 5 commits (merged to 'next' on 2022-09-12 at 33cb79c924) + list-objects-filter: convert filter_spec to a strbuf + list-objects-filter: add and use initializers + list-objects-filter: handle null default filter spec + list-objects-filter: don't memset after releasing filter struct + Merge branch 'jk/plug-list-object-filter-leaks' into jk/list-objects-filter-cleanup A couple of bugfixes with code clean-up. source: <Yx1qwlpNbxGEiUgc@xxxxxxxxxxxxxxxxxxxxxxx> * sy/mv-out-of-cone (2022-09-09) 10 commits (merged to 'next' on 2022-09-12 at 7cb7b41779) + builtin/mv.c: fix possible segfault in add_slash() (merged to 'next' on 2022-08-17 at 2316d9ce4d) + mv: check overwrite for in-to-out move + advice.h: add advise_on_moving_dirty_path() + mv: cleanup empty WORKING_DIRECTORY + mv: from in-cone to out-of-cone + mv: remove BOTH from enum update_mode + mv: check if <destination> is a SKIP_WORKTREE_DIR + mv: free the with_slash in check_dir_in_index() + mv: rename check_dir_in_index() to empty_dir_has_sparse_contents() + t7002: add tests for moving from in-cone to out-of-cone "git mv A B" in a sparsely populated working tree can be asked to move a path from a directory that is "in cone" to another directory that is "out of cone". Handling of such a case has been improved. source: <20220809120910.2021413-1-shaoxuan.yuan02@xxxxxxxxx> source: <20220909222736.279362-1-shaoxuan.yuan02@xxxxxxxxx> * vd/scalar-to-main (2022-09-02) 9 commits (merged to 'next' on 2022-09-14 at 230bf89c01) + Documentation/technical: include Scalar technical doc + t/perf: add 'GIT_PERF_USE_SCALAR' run option + t/perf: add Scalar performance tests + scalar-clone: add test coverage + scalar: add to 'git help -a' command list + scalar: implement the `help` subcommand + git help: special-case `scalar` + scalar: include in standard Git build & installation + scalar: fix command documentation section header Hoist the remainder of "scalar" out of contrib/ to the main part of the codebase. source: <pull.1341.v2.git.1662134210.gitgitgadget@xxxxxxxxx> * zh/ls-files-format (2022-09-12) 1 commit (merged to 'next' on 2022-09-12 at 91dda58387) + ls-files: fix black space in error message Typofix in the UI of a topic that has graduated to 'master'. source: <pull.1350.git.1662904997760.gitgitgadget@xxxxxxxxx> -------------------------------------------------- [New Topics] * fz/help-doublofix (2022-09-16) 1 commit (merged to 'next' on 2022-09-19 at 3ec5906f4e) + help: fix doubled words in explanation for developer interfaces Typofix for topic already in -rc0. Will merge to 'master'. source: <pull.1330.git.git.1663333529294.gitgitgadget@xxxxxxxxx> * so/diff-merges-cleanup (2022-09-16) 3 commits - diff-merges: clarify log.diffMerges documentation - diff-merges: cleanup set_diff_merges() - diff-merges: cleanup func_by_opt() Code clean-up. Will merge to 'next'? source: <20220914193102.5275-1-sorganov@xxxxxxxxx> * tz/tech-docs-to-help-fix (2022-09-16) 2 commits (merged to 'next' on 2022-09-19 at 4a13143da1) + api docs: link to html version of api-trace2 + docs: fix a few recently broken links Docfix for topic already in -rc0. Will merge to 'master'. source: <20220916062303.3736166-2-tmz@xxxxxxxxx> * ja/rebase-i-avoid-amending-self (2022-09-19) 1 commit - sequencer: avoid dropping fixup commit that targets self via commit-ish "git rebase -i" can mistakenly attempt to apply a fixup to a commit itself, which has been corrected. Will merge to 'next'? source: <20220918121053.880225-1-aclopte@xxxxxxxxx> * ml/commit-graph-expire-dir-leak-fix (2022-09-19) 1 commit (merged to 'next' on 2022-09-19 at e3211e888e) + commit-graph: Fix missing closedir in expire_commit_graphs A result from opendir() was leaking in the commit-graph expiration codepath, which has been plugged. Will merge to 'master'. source: <20220919141441.5644-1-linmq006@xxxxxxxxx> * vd/scalar-generalize-diagnose (2022-09-19) 1 commit (merged to 'next' on 2022-09-19 at e03e8a6e4a) + diagnose.c: refactor to safely use 'd_type' Portability fix. Will merge to 'master'. source: <pull.1354.git.1663438615413.gitgitgadget@xxxxxxxxx> * ac/fuzzers (2022-09-19) 1 commit - fuzz: reorganise the path for existing oss-fuzz fuzzers source: <pull.1353.v4.git.1663598215154.gitgitgadget@xxxxxxxxx> * hn/parse-worktree-ref (2022-09-19) 1 commit - refs: unify parse_worktree_ref() and ref_type() source: <pull.1325.v2.git.git.1663605291172.gitgitgadget@xxxxxxxxx> -------------------------------------------------- [Stalled] * es/mark-gc-cruft-as-experimental (2022-08-03) 2 commits - 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. Expecting a reroll. cf. <220804.86a68ke9d5.gmgdl@xxxxxxxxxxxxxxxxxxx> cf. <6803b725-526e-a1c8-f15c-a9ed4a144d4c@xxxxxxxxxx> source: <20220803205721.3686361-1-emilyshaffer@xxxxxxxxxx> * 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. cf. <20220728230210.2952731-1-calvinwan@xxxxxxxxxx> cf. <CAFySSZDvgwbbHCHfyuaqX3tKsr-GjJ9iihygg6rNNe46Ys7_EA@xxxxxxxxxxxxxx> source: <20220728230210.2952731-1-calvinwan@xxxxxxxxxx> -------------------------------------------------- [Cooking] * ed/fsmonitor-on-networked-macos (2022-09-19) 5 commits - fsmonitor: add documentation for allowRemote and socketDir options - fsmonitor: deal with synthetic firmlinks on macOS - fsmonitor: avoid socket location check if using hook - fsmonitor: relocate socket file if .git directory is remote - fsmonitor: refactor filesystem checks to common interface By default, use of fsmonitor on a repository on networked filesystem is disabled. Add knobs to make it workable on macOS. Will merge to 'next'? source: <pull.1326.v8.git.1663377141.gitgitgadget@xxxxxxxxx> * rj/branch-edit-description-with-nth-checkout (2022-09-12) 2 commits - branch: support for shortcuts like @{-1} completed - branch: refactor "edit_description" code path "git branch --edit-description @{-1}" is now a way to edit branch description of the branch you were on before switching to the current branch. Needs review. source: <7abdb5a9-5707-7897-4196-8d2892beeb81@xxxxxxxxx> * mj/credential-helper-auth-headers (2022-09-13) 8 commits - 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 - osxkeychain: clarify that we ignore unknown lines - netrc: ignore unknown lines (do not die) - wincred: ignore unknown lines (do not die) RFC source: <pull.1352.git.1663097156.gitgitgadget@xxxxxxxxx> * ec/reftable-pass-pq-entry-by-reference (2022-09-15) 1 commit (merged to 'next' on 2022-09-15 at 928e75c7d1) + reftable: use a pointer for pq_entry param Small code clean-up in reftable implementation. Will merge to 'master'. source: <1833f3928cb.acf3c97d869879.7909589521159235166@xxxxxxxxxxxxxx> * jc/environ-docs (2022-09-16) 5 commits - environ: GIT_INDEX_VERSION affects not just a new repository - environ: simplify description of GIT_INDEX_FILE - environ: GIT_FLUSH should be made a usual Boolean - environ: explain Boolean environment variables - environ: document GIT_SSL_NO_VERIFY Documentation on various Boolean GIT_* environment variables have been clarified. Will merge to 'next'? source: <20220915160659.126441-1-gitster@xxxxxxxxx> * rs/diff-caret-bang-with-parents (2022-09-15) 6 commits - revision: add parents after child for ^! - revision: rename add_parents_only() to add_nth_parent() - revision: factor out add_parents() - revision: factor out add_parent() - revision: factor out get_commit() - revision: use strtol_i() for exclude_parent "git diff rev^!" did not show combined diff to go to the rev from its parents. Needs review. source: <ba6eea28-fb3a-b376-2529-351727c02f1a@xxxxxx> * ab/doc-synopsis-and-cmd-usage (2022-09-07) 34 commits - tests: start asserting that *.txt SYNOPSIS matches -h output - doc txt & -h consistency: make "worktree" consistent - worktree: define subcommand -h in terms of command -h - reflog doc: list real subcommands up-front - doc txt & -h consistency: make "commit" consistent - doc txt & -h consistency: make "diff-tree" consistent - doc txt & -h consistency: use "[<label>...]" for "zero or more" - doc txt & -h consistency: make "annotate" consistent - doc txt & -h consistency: make "stash" consistent - doc txt & -h consistency: add missing options - doc txt & -h consistency: use "git foo" form, not "git-foo" - doc txt & -h consistency: make "bundle" consistent - doc txt & -h consistency: make "read-tree" consistent - doc txt & -h consistency: make "rerere" consistent - doc txt & -h consistency: add missing options and labels - doc txt & -h consistency: make output order consistent - doc txt & -h consistency: add or fix optional "--" syntax - doc txt & -h consistency: fix mismatching labels - t/helper/test-proc-receive.c: use "<options>", not "<options>..." - doc txt & -h consistency: use "<options>", not "<options>..." - stash doc SYNOPSIS & -h: correct padding around "[]()" - doc txt & -h consistency: correct padding around "[]()" - doc txt & -h consistency: add missing "]" to bugreport "-h" - doc txt & -h consistency: add "-z" to cat-file "-h" - doc txt & -h consistency: fix incorrect alternates syntax - doc txt & -h consistency: word-wrap - built-ins: consistently add "\n" between "usage" and options - doc SYNOPSIS & -h: fix incorrect alternates syntax - doc SYNOPSIS: consistently use ' for commands - doc SYNOPSIS: don't use ' for subcommands - blame: use a more detailed usage_msg_optf() error on bad -L - bundle: define subcommand -h in terms of command -h - builtin/bundle.c: use \t, not fix indentation 2-SP indentation - CodingGuidelines: update and clarify command-line conventions The short-help text shown by "git cmd -h" and the synopsis text shown at the beginning of "git help cmd" have been made more consistent. Needs review. source: <cover-00.34-00000000000-20220902T092734Z-avarab@xxxxxxxxx> * vd/doc-reviewing-guidelines (2022-09-19) 1 commit - Documentation: add ReviewingGuidelines Just like we have coding guidelines, we now have guidelines for reviewers. Will merge to 'next' and then to 'master'. source: <pull.1348.v2.git.1663614767058.gitgitgadget@xxxxxxxxx> * ab/coccicheck-incremental (2022-08-31) 9 commits - spatchcache: add a ccache-alike for "spatch" - 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 "make coccicheck" is time consuming. It has been made to run more incrementally. Needs review. source: <cover-v2-0.9-00000000000-20220831T205130Z-avarab@xxxxxxxxx> * tb/diffstat-with-utf8-strwidth (2022-09-14) 1 commit - diff.c: use utf8_strwidth() to count display width "git diff --stat" etc. were invented back when everything was ASCII and strlen() was a way to measure the display width of a string; adjust them to compute the display width assuming UTF-8 pathnames. Expecting a reroll. source: <20220914151333.3309-1-tboegi@xxxxxx> * gc/submodule-clone-update-with-branches (2022-08-29) 6 commits - clone, submodule update: check out branches - submodule--helper: refactor up-to-date criterion - submodule: return target of submodule symref - t5617: drop references to remote-tracking branches - 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. Expecting a reroll. cf. <20220901200047.515294-1-jonathantanmy@xxxxxxxxxx> and others source: <pull.1321.git.git.1661806456.gitgitgadget@xxxxxxxxx> * sy/sparse-grep (2022-09-08) 3 commits - builtin/grep.c: walking tree instead of expanding index with --sparse - builtin/grep.c: integrate with sparse index - builtin/grep.c: add --sparse option "git grep" learned to work better in a sparse checkout. The design of "--sparse" feels iffy. cf. <093827ae-41ef-5f7c-7829-647536ce1305@xxxxxxxxxx> cf. <CABPp-BF-z72=hY_Jf8h3g95s+wwZOsV_S=+dDNs_AVskQxoaTw@xxxxxxxxxxxxxx> source: <20220908001854.206789-1-shaoxuan.yuan02@xxxxxxxxx> * ds/use-platform-regex-on-macos (2022-08-26) 1 commit (merged to 'next' on 2022-09-14 at 80905596d8) + grep: fix multibyte regex handling under macOS With a bit of header twiddling, use the native regexp library on macOS instead of the compat/ one. Will cook in 'next'. cf. <xmqqzgf389k9.fsf@gitster.g> source: <20220826085815.2771102-1-dds@xxxxxxx> * ds/bundle-uri-3 (2022-09-09) 10 commits - bundle-uri: fetch a list of bundles - bundle-uri: limit recursion depth for bundle lists - bundle-uri: parse bundle list in config format - bundle-uri: unit test "key=value" parsing - bundle-uri: create "key=value" line parsing - bundle-uri: create base key-value pair parsing - bundle-uri: create bundle_list struct and helpers - bundle-uri: use plain string in find_temp_filename() - bundle-uri: short-circuit capability parsing - Merge branch 'ds/bundle-uri-clone' into ds/bundle-uri-3 Define the logical elements of a "bundle list", data structure to store them in-core, format to transfer them, and code to parse them. Needs review. source: <pull.1333.v2.git.1662734015.gitgitgadget@xxxxxxxxx> * js/cmake-updates (2022-08-24) 5 commits - cmake: increase time-out for a long-running test - cmake: avoid editing t/test-lib.sh - add -p: avoid ambiguous signed/unsigned comparison - cmake: copy the merge tools for testing - cmake: make it easier to diagnose regressions in CTest runs Update to build procedure with VS using CMake/CTest. Expecting a reroll. cf. <3df77ffd-85a2-3a54-9005-34a24ec6e82d@xxxxxxxxxx> cf. <531620e1-de4c-74aa-c840-c12ce81f8740@xxxxxxxxxx> and others source: <pull.1320.v2.git.1661243463.gitgitgadget@xxxxxxxxx> * pw/rebase-keep-base-fixes (2022-09-07) 7 commits - rebase --keep-base: imply --no-fork-point - rebase --keep-base: imply --reapply-cherry-picks - rebase: factor out branch_base calculation - rebase: rename merge_base to branch_base - rebase: store orig_head as a commit - t3416: set $EDITOR in subshell - t3416: tighten two tests "git rebase --keep-base" used to discard the commits that are already cherry-picked to the upstream, even when "keep-base" meant that the base, on top of which the history is being rebuilt, does not yet include these cherry-picked commits. The --keep-base option now implies --reapply-cherry-picks and --no-fork-point options. Expecting a reroll. cf. <e25127f3-6135-b716-a12f-5dbe4f40dc42@xxxxxxxxx> source: <pull.1323.v2.git.1662561470.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> * po/glossary-around-traversal (2022-07-09) 3 commits - glossary: add reachability bitmap description - glossary: add commit graph description - glossary: add Object DataBase (ODB) abbreviation The glossary entries for "commit-graph file" and "reachability bitmap" have been added. Expecting a reroll. cf. <dfe0c1ab-33f8-f13e-71ce-1829bb0d2d7f@iee.email> source: <pull.1282.git.1657385781.gitgitgadget@xxxxxxxxx> * 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>
