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 and may be annotated with an URL to a message that raises issues but they are no means exhaustive. A topic without enough support may be discarded after a long period of no activity. Copies of the source code to Git live in many repositories, and the following is a list of the ones I push into or their mirrors. Some repositories have only a subset of branches. With maint, master, next, seen, todo: git://git.kernel.org/pub/scm/git/git.git/ git://repo.or.cz/alt-git.git/ https://kernel.googlesource.com/pub/scm/git/git/ https://github.com/git/git/ https://gitlab.com/git-vcs/git/ With all the integration branches and topics broken out: https://github.com/gitster/git/ Even though the preformatted documentation in HTML and man format are not sources, they are published in these repositories for convenience (replace "htmldocs" with "manpages" for the manual pages): git://git.kernel.org/pub/scm/git/git-htmldocs.git/ https://github.com/gitster/git-htmldocs.git/ Release tarballs are available at: https://www.kernel.org/pub/software/scm/git/ -------------------------------------------------- [Graduated to 'master'] * ab/retire-scripted-add-p (2023-03-27) 1 commit (merged to 'next' on 2023-03-27 at f8cbc0c604) + t3701: we don't need no Perl for `add -i` anymore Test fix. source: <pull.1504.git.1679898996492.gitgitgadget@xxxxxxxxx> * ah/rebase-merges-config (2023-03-27) 3 commits (merged to 'next' on 2023-03-27 at c8a894ba4b) + rebase: add a config option for --rebase-merges + rebase: deprecate --rebase-merges="" + rebase: add documentation and test for --no-rebase-merges Streamline --rebase-merges command line option handling and introduce rebase.merges configuration variable. source: <20230326030636.2635642-1-alexhenrie24@xxxxxxxxx> * ar/test-cleanup-unused-file-creation (2023-03-20) 7 commits (merged to 'next' on 2023-03-28 at ad035b41ea) + t1507: assert output of rev-parse + t1404: don't create unused file + t1400: assert output of update-ref + t1302: don't create unused file + t1010: don't create unused files + t1006: assert error output of cat-file + t1005: assert output of ls-files Test clean-up. source: <20230312201520.370234-1-rybak.a.v@xxxxxxxxx> * bb/unicode-width-table-15 (2023-03-30) 1 commit (merged to 'next' on 2023-03-31 at b8f3e899ac) + unicode: update the width tables to Unicode 15 Update width table for the latest edition of Unicode. source: <20230330191517.1762375-1-dev+git@xxxxxxxxx> * ds/p2000-fix-grep-sparse (2023-03-28) 1 commit (merged to 'next' on 2023-03-29 at 6a59283aa3) + p2000: remove stray '--sparse' flag from test Fix perf test. source: <pull.1505.git.1680034162144.gitgitgadget@xxxxxxxxx> * jc/am-doc-refer-to-format-patch (2023-03-21) 1 commit (merged to 'next' on 2023-03-23 at 01b35c0581) + am: refer to format-patch in the documentation Doc update. source: <xmqq1qlij9qr.fsf@gitster.g> * jk/blame-contents-with-arbitrary-commit (2023-03-24) 1 commit (merged to 'next' on 2023-03-27 at 74beb3baf9) + blame: allow --contents to work with non-HEAD commit "git blame --contents=<file> <rev> -- <path>" used to be forbidden, but now it finds the origins of lines starting at <file> contents through the history that leads to <rev>. source: <20230324170800.331022-1-jacob.e.keller@xxxxxxxxx> * jk/document-rev-list-object-name (2023-03-28) 1 commit (merged to 'next' on 2023-03-29 at e1cd79f572) + docs: document caveats of rev-list's object-name output Document what the pathname-looking strings in "rev-list --object" output are for and what they mean. source: <20230328182650.GC18558@xxxxxxxxxxxxxxxxxxxxxxx> * jk/fast-export-cleanup (2023-03-22) 6 commits (merged to 'next' on 2023-03-27 at 12b9a9308e) + fast-export: drop unused parameter from anonymize_commit_message() + fast-export: drop data parameter from anonymous generators + fast-export: de-obfuscate --anonymize-map handling + fast-export: factor out anonymized_entry creation + fast-export: simplify initialization of anonymized hashmaps + fast-export: drop const when storing anonymized values Code clean-up. source: <20230322173636.GA5643@xxxxxxxxxxxxxxxxxxxxxxx> * jk/really-deprecate-pack-redundant (2023-03-23) 1 commit (merged to 'next' on 2023-03-29 at 4d1bc9ac42) + pack-redundant: escalate deprecation warning to an error "git pack-redundant" gave a warning when run, as the command has outlived its usefulness long ago and is nominated for future removal. Now we escalate to give an error. source: <20230323204047.GA9290@xxxxxxxxxxxxxxxxxxxxxxx> * js/split-index-fixes (2023-03-27) 4 commits (merged to 'next' on 2023-03-27 at 3a7b7da0d1) + unpack-trees: take care to propagate the split-index flag + fsmonitor: avoid overriding `cache_changed` bits + split-index; stop abusing the `base_oid` to strip the "link" extension + split-index & fsmonitor: demonstrate a bug The index files can become corrupt under certain conditions when the split-index feature is in use, especially together with fsmonitor, which have been corrected. source: <pull.1497.v2.git.1679870743.gitgitgadget@xxxxxxxxx> * js/t5563-portability-fix (2023-03-31) 1 commit (merged to 'next' on 2023-03-31 at 12f95a9567) + t5563: prevent "ambiguous redirect" Test portability fix. source: <pull.1507.git.1680245525637.gitgitgadget@xxxxxxxxx> * kh/commentchar-config-error-message (2023-03-27) 1 commit (merged to 'next' on 2023-03-27 at 7fdda0a984) + config: tell the user that we expect an ASCII character Doc update. source: <20230327194344.12910-1-code@xxxxxxxxxxxxxxx> * mk/workaround-pcre-jit-ucp-bug (2023-03-23) 1 commit (merged to 'next' on 2023-03-24 at d6c402a77b) + grep: work around UTF-8 related JIT bug in PCRE2 <= 10.34 A recent-ish change to allow unicode character classes to be used with "grep -P" triggered a JIT bug in older pcre2 libraries. The problematic change in Git built with these older libraries has been disabled to work around the bug. source: <20230323172539.25230-1-minipli@xxxxxxxxxxxxxx> * ob/rollback-after-commit-lock-failure (2023-03-24) 1 commit (merged to 'next' on 2023-03-27 at ea237a011c) + sequencer: remove pointless rollback_lock_file() Code clean-up. source: <20230323162235.995529-1-oswald.buddenhagen@xxxxxx> * ob/sequencer-save-head-simplify (2023-03-24) 1 commit (merged to 'next' on 2023-03-27 at 388e26f1d1) + sequencer: rewrite save_head() in terms of write_message() Code clean-up. source: <20230323162235.995544-1-oswald.buddenhagen@xxxxxx> * pw/wildmatch-fixes (2023-03-27) 4 commits (merged to 'next' on 2023-03-27 at 40f52ba243) + t3070: make chain lint tester happy (merged to 'next' on 2023-03-24 at d0d1f23565) + wildmatch: hide internal return values + wildmatch: avoid undefined behavior + wildmatch: fix exponential behavior The wildmatch library code unlearns exponential behaviour it acquired some time ago since it was borrowed from rsync. source: <cover.1679328580.git.phillip.wood@xxxxxxxxxxxxx> * rs/archive-mtime (2023-03-27) 1 commit (merged to 'next' on 2023-03-27 at 672cd32edf) + t5000: use check_mtime() Test update. source: <233edbbe-35c1-9b5b-7578-4c70c6d24449@xxxxxx> * sg/parse-options-h-initializers (2023-03-20) 3 commits (merged to 'next' on 2023-03-23 at f16b3ab6d7) + parse-options.h: use designated initializers in OPT_* macros + parse-options.h: rename _OPT_CONTAINS_OR_WITH()'s parameters + parse-options.h: use consistent name for the callback parameters Code clean-up to use designated initializers in parse-options API. source: <20230319165648.656738-1-szeder.dev@xxxxxxxxx> * sg/parse-options-h-users (2023-03-20) 2 commits (merged to 'next' on 2023-03-23 at 2ca7d1e737) + treewide: remove unnecessary inclusions of parse-options.h from headers + treewide: include parse-options.h in source files Code clean-up to include and/or uninclude parse-options.h file as needed. source: <20230319162712.654137-1-szeder.dev@xxxxxxxxx> * ss/hashmap-typofix (2023-03-30) 1 commit (merged to 'next' on 2023-03-30 at ac1e443424) + hashmap.h: fix minor typo Typofix. source: <pull.1506.git.1680190083688.gitgitgadget@xxxxxxxxx> -------------------------------------------------- [New Topics] * ow/ref-filter-omit-empty (2023-03-30) 1 commit - branch, for-each-ref: add option to omit empty lines "git branch --format=..." and "git format-patch --format=..." learns "--omit-empty-lines" to hide refs that whose formatting result becomes an empty string from the output. Expecting a reroll. "git tag" should learn the same. cf. <xmqqilei1bgk.fsf@gitster.g> source: <20230330112133.4437-3-oystwa@xxxxxxxxx> * ow/ref-format-remove-unused-member (2023-03-30) 1 commit (merged to 'next' on 2023-03-30 at 898a5df956) + ref-filter: remove unused ref_format member Code clean-up. Will merge to 'master'. source: <20230330112133.4437-2-oystwa@xxxxxxxxx> * rn/sparse-describe (2023-04-03) 1 commit - describe: enable sparse index for describe "git describe --dirty" learns to work better with sparse-index. Will merge to 'next'? source: <20230403164749.246001-1-nanth.raghul@xxxxxxxxx> * ds/fetch-bundle-uri-with-all (2023-03-31) 1 commit (merged to 'next' on 2023-03-31 at a9f787341d) + fetch: download bundles once, even with --all "git fetch --all" does not have to download and handle the same bundleURI over and over, which has been corrected. Will merge to 'master'. source: <pull.1508.git.1680278344173.gitgitgadget@xxxxxxxxx> * ar/adjust-tests-for-the-index-fallout (2023-03-31) 2 commits (merged to 'next' on 2023-04-04 at 48861fc381) + t2107: fix mention of the_index.cache_changed + t3060: fix mention of function prune_index Comment updates. Will merge to 'master'. source: <20230331143604.82040-2-rybak.a.v@xxxxxxxxx> * ah/format-patch-thread-doc (2023-04-03) 1 commit - format-patch: correct documentation of --thread without an argument Doc update. source: <20230403040724.642513-1-alexhenrie24@xxxxxxxxx> * ar/test-cleanup-unused-file-creation-part2 (2023-04-03) 6 commits - t2019: don't create unused files - t1502: don't create unused files - t1450: don't create unused files - t1300: don't create unused files - t1300: fix config file syntax error descriptions - t0300: don't create unused file Test cleanup. Will merge to 'next'? source: <20230403223338.468025-1-rybak.a.v@xxxxxxxxx> * en/header-split-cache-h (2023-04-04) 25 commits - mailmap, quote: move declarations of global vars to correct unit - treewide: reduce includes of cache.h in other headers - treewide: remove double forward declaration of read_in_full - strbuf: move forward declarations to beginning of file - cache.h: remove unnecessary includes - treewide: remove cache.h inclusion due to pager.h changes - pager.h: move declarations for pager.c functions from cache.h - treewide: remove cache.h inclusion due to editor.h changes - editor: move editor-related functions and declarations into common file - treewide: remove cache.h inclusion due to object.h changes - object.h: move some inline functions and defines from cache.h - treewide: remove cache.h inclusion due to object-file.h changes - object-file.h: move declarations for object-file.c functions from cache.h - treewide: remove cache.h inclusion due to git-zlib changes - git-zlib: move declarations for git-zlib functions from cache.h - treewide: remove cache.h inclusion due to object-name.h changes - object-name.h: move declarations for object-name.c functions from cache.h - treewide: remove unnecessary cache.h inclusion - treewide: be explicit about dependence on mem-pool.h - treewide: be explicit about dependence on oid-array.h - treewide: be explicit about dependence on pack-revindex.h - treewide: be explicit about dependence on convert.h - treewide: be explicit about dependence on advice.h - treewide: be explicit about dependence on trace.h & trace2.h - Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-cache-h (this branch uses ab/remove-implicit-use-of-the-repository and en/header-split-cleanup.) Header clean-up. source: <pull.1509.v2.git.1680571348.gitgitgadget@xxxxxxxxx> * jx/cap-object-info-uninitialized-fix (2023-04-03) 1 commit - object-info: init request_info before reading arg Correct use of an uninitialized structure member. Will merge to 'next'. source: <20230402130557.17662-1-worldhello.net@xxxxxxxxx> * sl/sparse-write-tree (2023-04-04) 1 commit - write-tree: integrate with sparse index "git write-tree" learns to work better with sparse-index. Will merge to 'next'. source: <20230404003539.1578245-1-cheskaqiqi@xxxxxxxxx> -------------------------------------------------- [Stalled] * ed/fsmonitor-inotify (2022-12-13) 6 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 Bundled fsmonitor for Linux using inotify API. What's the status of this one? source: <pull.1352.v5.git.git.1670882286.gitgitgadget@xxxxxxxxx> * ja/worktree-orphan (2023-01-13) 4 commits - worktree add: add hint to direct users towards --orphan - worktree add: add --orphan flag - worktree add: refactor opt exclusion tests - worktree add: include -B in usage docs 'git worktree add' learned how to create a worktree based on an orphaned branch with `--orphan`. Expecting a reroll. cf. <11be1b0e-ee38-119f-1d80-cb818946116b@xxxxxxxxxxxxx> source: <20230109173227.29264-1-jacobabel@xxxxxxxxxx> * tl/notes-separator (2023-03-28) 4 commits . notes.c: don't do stripespace when parse file arg . notes.c: introduce '--separator=<paragraph-break>' option . notes.c: use designated initializers for clarity . notes.c: cleanup 'strbuf_grow' call in 'append_edit' 'git notes append' was taught '--separator' to specify string to insert between paragraphs. Seems to break CI. cf. <xmqqy1nf8c0f.fsf@gitster.g> source: <cover.1680012650.git.dyroneteng@xxxxxxxxx> * ab/tag-object-type-errors (2022-11-22) 5 commits - tag: don't emit potentially incorrect "object is a X, not a Y" - tag: don't misreport type of tagged objects in errors - object tests: add test for unexpected objects in tags - object-file.c: free the "t.tag" in check_tag() - Merge branch 'jk/parse-object-type-mismatch' into ab/tag-object-type-errors Hardening checks around mismatched object types when one of those objects is a tag. Expecting a reroll. cf. <xmqqzgb5jz5c.fsf@gitster.g> cf. <xmqqsfgxjugi.fsf@gitster.g> source: <cover-0.4-00000000000-20221118T113442Z-avarab@xxxxxxxxx> * jc/spell-id-in-both-caps-in-message-id (2023-04-03) 1 commit (merged to 'next' on 2023-04-04 at 4cfa5997eb) + e-mail workflow: Message-ID is spelled with ID in both capital letters Consistently spell "Message-ID" as such, not "Message-Id". Will merge to 'master'. source: <xmqqsfhgnmqg.fsf@gitster.g> * ad/test-record-count-when-harness-is-in-use (2022-12-25) 1 commit - test-lib: allow storing counts with test harnesses Allow summary results from tests to be written to t/test-results directory even when a test harness like 'prove' is in use. Expecting a reroll. cf. <CABPp-BGoPuGCZw+9wCgdYyRR4Zf4y9Kun27GrQhtMdYWpOUsYQ@xxxxxxxxxxxxxx> source: <20221224225200.1027806-1-adam@xxxxxxxxxxxxx> * so/diff-merges-more (2022-12-18) 5 commits - diff-merges: improve --diff-merges documentation - diff-merges: issue warning on lone '-m' option - diff-merges: support list of values for --diff-merges - diff-merges: implement log.diffMerges-m-imply-p config - diff-merges: implement [no-]hide option and log.diffMergesHide config Assorted updates to "--diff-merges=X" option. May want to discard. Breaking compatibility does not seem worth it. source: <20221217132955.108542-1-sorganov@xxxxxxxxx> -------------------------------------------------- [Cooking] * sm/ssl-key-type-config (2023-03-23) 1 commit (merged to 'next' on 2023-03-30 at 773716fc60) + http: add support for different sslcert and sslkey types. Add a few configuration variables to tell the cURL library that different types of ssl-cert and ssl-key are in use. Will merge to 'master'. source: <pull.1474.v2.git.git.1679327330032.gitgitgadget@xxxxxxxxx> * ed/fsmonitor-windows-named-pipe (2023-03-24) 1 commit - fsmonitor: handle differences between Windows named pipe functions Fix fsmonitor on Windows when the filesystem path contains certain characters. Expecting a reroll. cf. <b9cf67e4-22a7-2ff0-8310-9223bea10d6d@xxxxxxxxxxxxxxxxx> source: <pull.1503.git.1679678090412.gitgitgadget@xxxxxxxxx> * ps/ahead-behind-truncation-fix (2023-03-27) 1 commit (merged to 'next' on 2023-03-31 at 60bc243011) + commit-graph: fix truncated generation numbers (this branch uses ds/ahead-behind.) Fix unnecessary truncation of generation numbers used in-core. Will merge to 'master'. source: <f8a0a869e8b0882f05cac49d78f49ba3553d3c44.1679904401.git.ps@xxxxxx> * ws/sparse-check-rules (2023-03-27) 2 commits (merged to 'next' on 2023-04-04 at 17a29244a6) + builtin/sparse-checkout: add check-rules command + builtin/sparse-checkout: remove NEED_WORK_TREE flag "git sparse-checkout" command learns a debugging aid for the sparse rule definitions. Will merge to 'master'. source: <pull.1488.v2.git.1679903703.gitgitgadget@xxxxxxxxx> * mh/credential-password-expiry-wincred (2023-04-03) 1 commit - credential/wincred: store password_expiry_utc Teach the recently invented "password expiry time" trait to the wincred credential helper. Will merge to 'next'? source: <pull.1477.v3.git.git.1680508028077.gitgitgadget@xxxxxxxxx> * mh/use-wincred-from-system (2023-03-27) 1 commit - credential/wincred: include wincred.h Code clean-up. Area maintainer is fairly negative. Perhaps drop? cf. <8511e030-8167-715c-5ed4-1646e6e9ef85@xxxxxx> source: <pull.1496.git.1679707396407.gitgitgadget@xxxxxxxxx> * jk/chainlint-fixes (2023-03-30) 5 commits (merged to 'next' on 2023-03-30 at 52f229b710) + tests: skip test_eval_ in internal chain-lint + tests: drop here-doc check from internal chain-linter + tests: diagnose unclosed here-doc in chainlint.pl + tests: replace chainlint subshell with a function + tests: run internal chain-linter under "make test" Test framework fix. Will merge to 'master'. source: <20230330192712.GA27719@xxxxxxxxxxxxxxxxxxxxxxx> * jk/document-pack-redundant-deprecation (2023-03-30) 1 commit (merged to 'next' on 2023-03-30 at e9d10e27a4) + pack-redundant: document deprecation Document that we have marked "pack-redundant" as deprecated. Will merge to 'master'. source: <20230328190641.GF18558@xxxxxxxxxxxxxxxxxxxxxxx> * ob/revert-of-revert (2023-03-28) 1 commit - sequencer: call a revert of a revert "reapply" Instead of "Revert "Revert "original"", give "Replay "original"" as the title for a revert of a revert. Needs more polishing: docs, tests, transitions. source: <20230323162234.995465-1-oswald.buddenhagen@xxxxxx> * jk/unused-post-2.40-part2 (2023-03-28) 7 commits (merged to 'next' on 2023-03-29 at 7aeee1b6c6) + parse-options: drop parse_opt_unknown_cb() + t/helper: mark unused argv/argc arguments + mark "argv" as unused when we check argc + builtins: mark unused prefix parameters + builtins: annotate always-empty prefix parameters + builtins: always pass prefix to parse_options() + fast-import: fix file access when run from subdir Code clean-up for "-Wunused-parameter" build. Will merge to 'master'. source: <20230328205253.GA1753925@xxxxxxxxxxxxxxxxxxxxxxx> * pw/sequencer-rescheduled-ones-are-not-done-yet (2023-03-20) 1 commit - rebase -i: do not update "done" when rescheduling command "rebase -i" moved a "rescheduled" insn in the todo file to the "done" list before it completed, which has been corrected. Expecting clarification. source: <pull.1492.git.1679237337683.gitgitgadget@xxxxxxxxx> * rs/archive-from-subdirectory-fixes (2023-03-24) 1 commit - archive: improve support for running in subdirectory "git archive" run from a subdirectory mishandled attributes and paths outside the current directory. source: <7c33b01b-7b2a-25fa-9a66-1e65cd12bc84@xxxxxx> * tb/pack-bitmap-index-seek (2023-03-20) 6 commits (merged to 'next' on 2023-03-21 at b579e226b5) + pack-bitmap.c: factor out `bitmap_index_seek_commit()` + pack-bitmap.c: use `bitmap_index_seek()` where possible + pack-bitmap.c: factor out manual `map_pos` manipulation + pack-bitmap.c: drop unnecessary 'inline's + pack-bitmap.c: hide bitmap internals in `read_be32()` + pack-bitmap.c: hide bitmap internals in `read_u8()` Clean-up the pack-bitmap codepath. On hold. There is a BUG() on data errors. source: <cover.1679342296.git.me@xxxxxxxxxxxx> * en/header-split-cleanup (2023-03-21) 16 commits (merged to 'next' on 2023-03-30 at b69ff46cad) + csum-file.h: remove unnecessary inclusion of cache.h + write-or-die.h: move declarations for write-or-die.c functions from cache.h + treewide: remove cache.h inclusion due to setup.h changes + setup.h: move declarations for setup.c functions from cache.h + treewide: remove cache.h inclusion due to environment.h changes + environment.h: move declarations for environment.c functions from cache.h + treewide: remove unnecessary includes of cache.h + wrapper.h: move declarations for wrapper.c functions from cache.h + path.h: move function declarations for path.c functions from cache.h + cache.h: remove expand_user_path() + abspath.h: move absolute path functions from cache.h + environment: move comment_line_char from cache.h + treewide: remove unnecessary cache.h inclusion from several sources + treewide: remove unnecessary inclusion of gettext.h + treewide: be explicit about dependence on gettext.h + treewide: remove unnecessary cache.h inclusion from a few headers (this branch is used by en/header-split-cache-h.) Split key function and data structure definitions out of cache.h to new header files and adjust the users. Will merge to 'master'. source: <pull.1493.v2.git.1679379968.gitgitgadget@xxxxxxxxx> * nw/for-each-ref-signature (2023-03-13) 1 commit . ref-filter: add new "signature" atom "git (for-each-ref|branch|tag) --format=<format>" learns the "%(signature)" placeholder and friends. Breaks CI. cf. <xmqqpm9bosjw.fsf@gitster.g> source: <20230311210607.64927-2-nsengiyumvawilberforce@xxxxxxxxx> * mh/credential-oauth-refresh-token (2023-03-14) 1 commit - credential: new attribute oauth_refresh_token The credential subsystem learns to help OAuth framework. Needs Review. source: <pull.1394.git.1678776364753.gitgitgadget@xxxxxxxxx> * mh/credential-password-expiry-libsecret (2023-03-27) 1 commit - credential/libsecret: support password_expiry_utc The libsecret credential helper learns to handle the password expiry time information. Needs Review. source: <pull.1469.v2.git.git.1679729764851.gitgitgadget@xxxxxxxxx> * ps/fetch-ref-update-reporting (2023-03-20) 6 commits (merged to 'next' on 2023-03-30 at e5df1cae0b) + fetch: centralize printing of reference updates + fetch: centralize logic to print remote URL + fetch: centralize handling of per-reference format + fetch: pass the full local reference name to `format_display` + fetch: move output format into `display_state` + fetch: move reference width calculation into `display_state` Clean-up of the code path that reports what "git fetch" did to each ref. Will merge to 'master'. source: <cover.1679315383.git.ps@xxxxxx> * pw/rebase-cleanup-merge-strategy-option-handling (2023-03-15) 5 commits - rebase: remove a couple of redundant strategy tests - rebase -m: fix serialization of strategy options - rebase -m: cleanup --strategy-option handling - rebase: stop reading and writing unnecessary strategy state - Merge branch 'ab/fix-strategy-opts-parsing' Clean-up of the code path that deals with merge strategy option handling in "git rebase". Needs review. source: <cover.1678893298.git.phillip.wood@xxxxxxxxxxxxx> * ab/remove-implicit-use-of-the-repository (2023-03-28) 17 commits (merged to 'next' on 2023-03-30 at e0abe2d872) + libs: use "struct repository *" argument, not "the_repository" + post-cocci: adjust comments for recent repo_* migration + cocci: apply the "revision.h" part of "the_repository.pending" + cocci: apply the "rerere.h" part of "the_repository.pending" + cocci: apply the "refs.h" part of "the_repository.pending" + cocci: apply the "promisor-remote.h" part of "the_repository.pending" + cocci: apply the "packfile.h" part of "the_repository.pending" + cocci: apply the "pretty.h" part of "the_repository.pending" + cocci: apply the "object-store.h" part of "the_repository.pending" + cocci: apply the "diff.h" part of "the_repository.pending" + cocci: apply the "commit.h" part of "the_repository.pending" + cocci: apply the "commit-reach.h" part of "the_repository.pending" + cocci: apply the "cache.h" part of "the_repository.pending" + cocci: add missing "the_repository" macros to "pending" + cocci: sort "the_repository" rules by header + cocci: fix incorrect & verbose "the_repository" rules + cocci: remove dead rule from "the_repository.pending.cocci" (this branch is used by en/header-split-cache-h.) Code clean-up around the use of the_repository. Will merge to 'master'. source: <cover-v2-00.17-00000000000-20230328T110946Z-avarab@xxxxxxxxx> * jk/unused-post-2.40 (2023-03-17) 4 commits (merged to 'next' on 2023-03-30 at 10aeb0d4ae) + transport: mark unused parameters in fetch_refs_from_bundle() + http: mark unused parameter in fill_active_slot() callbacks + http: drop unused parameter from start_object_request() + mailmap: drop debugging code More "-Wunused-parameters" code clean-up. Will merge to 'master'. source: <ZBS77VYL9ZrxKtCN@xxxxxxxxxxxxxxxxxxxxxxx> * sl/diff-files-sparse (2023-03-22) 2 commits - diff-files: integrate with sparse index - t1092: add tests for `git diff-files` Teach "diff-files" not to expand sparse-index unless needed. Comments? source: <20230322161820.3609-1-cheskaqiqi@xxxxxxxxx> * ds/ahead-behind (2023-03-20) 9 commits (merged to 'next' on 2023-03-23 at a607895174) + commit-reach: add tips_reachable_from_bases() + for-each-ref: add ahead-behind format atom + commit-reach: implement ahead_behind() logic + commit-graph: introduce `ensure_generations_valid()` + commit-graph: return generation from memory + commit-graph: simplify compute_generation_numbers() + commit-graph: refactor compute_topological_levels() + for-each-ref: explicitly test no matches + for-each-ref: add --stdin option (this branch is used by ps/ahead-behind-truncation-fix.) "git for-each-ref" learns '%(ahead-behind:<base>)' that computes the distances from a single reference point in the history with bunch of commits in bulk. Will merge to 'master' together with ps/ahead-behind-truncation-fix topic. source: <pull.1489.v4.git.1679311615.gitgitgadget@xxxxxxxxx> * gc/config-parsing-cleanup (2023-03-28) 8 commits (merged to 'next' on 2023-03-30 at e7ea626edf) + config.c: rename "struct config_source cf" + config: report cached filenames in die_bad_number() + config.c: remove current_parsing_scope + config.c: remove current_config_kvi + config.c: plumb the_reader through callbacks + config.c: create config_reader and the_reader + config.c: don't assign to "cf_global" directly + config.c: plumb config_source through static fns Config API clean-up to reduce its dependence on static variables Will merge to 'master'. source: <pull.1463.v3.git.git.1680025914.gitgitgadget@xxxxxxxxx> * my/wildmatch-cleanups (2023-02-27) 5 commits . wildmatch: more cleanups after killing uchar . wildmatch: use char instead of uchar . wildmatch: remove NEGATE_CLASS(2) macros with trivial refactoring . wildmatch: remove IS*() macros . git-compat-util: add isblank() and isgraph() Code clean-up. Ejected as it conflicts with pw/wildmatch-fixes topic. source: <20230226115021.1681834-1-masahiroy@xxxxxxxxxx> * cw/forbid-use-of-gitlink-outside-submodules (2023-02-28) 6 commits . add: reject nested repositories . tests: remove duplicate .gitmodules path . tests: use `git submodule add` and fix expected status . tests: use `git submodule add` and fix expected diffs . tests: Use `git submodule add` instead of `git add` . t4041, t4060: modernize test style Forbid "git add dir" from adding a gitlink to the index. Comments? Seems to break tests when merged to 'seen'. source: <20230228185253.2356546-1-calvinwan@xxxxxxxxxx> * tk/pull-conflict-suggest-rebase-merge-not-rebase-true (2023-02-13) 1 commit - pull: conflict hint pull.rebase suggestion should offer "merges" vs "true" In an advice message after failed non-ff pull, we used to suggest setting pull.rebase=true, but these days pull.rebase=merges may be more inline with the original spirit of "rebuild your side on top of theirs". On hold. This is too much of a departure from the existing practice. cf. <CAMMLpeTPEoKVTbfc17w+Y9qn7jOGmQi_Ux0Y3sFW5QTgGWJ=SA@xxxxxxxxxxxxxx> cf. <CABPp-BGqAxKnxDRVN4cYMteLp33hvto07R3=TJBT5WubJT4+Og@xxxxxxxxxxxxxx> source: <pull.1474.git.1675614276549.gitgitgadget@xxxxxxxxx> * rj/branch-unborn-in-other-worktrees (2023-03-27) 5 commits - branch: avoid unnecessary worktrees traversals - branch: rename orphan branches in any worktree - branch: description for orphan branch errors - branch: use get_worktrees() in copy_or_rename_branch() - branch: test for failures while renaming branches Error messages given when working on an unborn branch that is checked out in another worktree have been improved. Kicked out of 'next' to replace with an updated version. source: <f8e6447e-5cd3-98fa-f567-39e1c60dacb0@xxxxxxxxx> * ab/imap-send-requires-curl (2023-02-02) 6 commits - imap-send: correctly report "host" when using "tunnel" - imap-send: remove old --no-curl codepath - imap-send: make --curl no-optional - imap-send: replace auto-probe libcurl with hard dependency - imap-send doc: the imap.sslVerify is used with imap.tunnel - imap-send: note "auth_method", not "host" on auth method failure Give a hard dependency on cURL library to build "git imap-send", and remove the code to interact with IMAP server without using cURL. Expecting a reroll. The 'tunnel' part is still iffy. cf. <230203.86bkmabfjr.gmgdl@xxxxxxxxxxxxxxxxxxx> source: <cover-v2-0.6-00000000000-20230202T093706Z-avarab@xxxxxxxxx> * ab/config-multi-and-nonbool (2023-03-28) 9 commits (merged to 'next' on 2023-03-30 at bcfe99b43d) + 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 API: add and use a "git_config_get()" family of functions + config tests: add "NULL" tests for *_get_value_multi() + config tests: cover blind spots in git_die_config() tests Assorted config API updates. Will merge to 'master'. source: <cover-v8-0.9-00000000000-20230328T140126Z-avarab@xxxxxxxxx> * cb/checkout-same-branch-twice (2023-03-22) 2 commits - SQUASH??? the test marked to expect failure passes from day one - checkout/switch: disallow checking out same branch in multiple worktrees "git checkout -B $branch" failed to protect against checking out a branch that is checked out elsewhere, unlike "git branch -f" did. Expecting a hopefully minor and final reroll. cf. <8f24fc3c-c30f-dc70-5a94-5ee4ed3de102@xxxxxxxxxxxxx> source: <20230120113553.24655-1-carenas@xxxxxxxxx> * ms/send-email-feed-header-to-validate-hook (2023-01-19) 2 commits - send-email: expose header information to git-send-email's sendemail-validate hook - send-email: refactor header generation functions "git send-email" learned to give the e-mail headers to the validate hook by passing an extra argument from the command line. Expecting a hopefully minor and final reroll. cf. <c1ba0a28-3c39-b313-2757-dceb02930334@xxxxxxx> source: <20230120012459.920932-1-michael.strawbridge@xxxxxxx> * tc/cat-file-z-use-cquote (2023-03-03) 2 commits . cat-file: quote-format name in error when using -z . cat-file: extract printing batch error message into function "cat-file" in the batch mode that is fed NUL-terminated pathnames learned to cquote them in its error output (otherwise, a funny pathname with LF in it would break the lines in the output stream). Breaks "cat-file --batch-all-objects --batch-check". cf. <xmqqilfhctrr.fsf@gitster.g> source: <20230303191708.77894-1-toon@xxxxxxxxx> * cw/submodule-status-in-parallel (2023-03-02) 6 commits - diff-lib: parallelize run_diff_files for submodules - diff-lib: refactor out diff_change logic - submodule: refactor is_submodule_modified() - submodule: move status parsing into function - submodule: rename strbuf variable - run-command: add on_stderr_output_fn to run_processes_parallel_opts "git submodule status" learned to run the comparison in submodule repositories in parallel. Expecting a reroll. cf. <CAFySSZDk05m6gU5-V1R+y3YnQ5PPduVW54+_gjBwD0rmacsLsw@xxxxxxxxxxxxxx> cf. <230307.865ybc273g.gmgdl@xxxxxxxxxxxxxxxxxxx> source: <20230302215237.1473444-1-calvinwan@xxxxxxxxxx>
