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 (of course they can be resubmit when new interests arise). The preview release for 2.43 will be tagged and pushed out shortly. 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] * jc/strbuf-comment-line-char (2023-11-01) 4 commits - strbuf: move env-using functions to environment.c - strbuf: make add_lines() public - strbuf_add_commented_lines(): drop the comment_line_char parameter - strbuf_commented_addf(): drop the comment_line_char parameter Code simplification. source: <cover.1698791220.git.jonathantanmy@xxxxxxxxxx> * ps/show-ref (2023-11-01) 12 commits (merged to 'next' on 2023-11-02 at 987bb117f5) + t: use git-show-ref(1) to check for ref existence + builtin/show-ref: add new mode to check for reference existence + builtin/show-ref: explicitly spell out different modes in synopsis + builtin/show-ref: ensure mutual exclusiveness of subcommands + builtin/show-ref: refactor options for patterns subcommand + builtin/show-ref: stop using global vars for `show_one()` + builtin/show-ref: stop using global variable to count matches + builtin/show-ref: refactor `--exclude-existing` options + builtin/show-ref: fix dead code when passing patterns + builtin/show-ref: fix leaking string buffer + builtin/show-ref: split up different subcommands + builtin/show-ref: convert pattern to a local variable Teach "git show-ref" a mode to check the existence of a ref. Will merge to 'master'. source: <cover.1698739941.git.ps@xxxxxx> * rc/trace-upload-pack (2023-10-30) 1 commit (merged to 'next' on 2023-11-01 at 90892b5cf0) + upload-pack: add tracing for fetches Trace2 update. Will merge to 'master'. source: <pull.1598.v2.git.1697577168128.gitgitgadget@xxxxxxxxx> * bc/merge-file-object-input (2023-11-02) 2 commits - merge-file: add an option to process object IDs - git-merge-file doc: drop "-file" from argument placeholders "git merge-file" learns a mode to read three contents to be merged from blob objects. Will merge to 'next'. source: <20231101192419.794162-1-sandals@xxxxxxxxxxxxxxxxxxxx> * jc/test-i18ngrep (2023-10-31) 2 commits - tests: teach callers of test_i18ngrep to use test_grep - test framework: further deprecate test_i18ngrep Another step to deprecate test_i18ngrep. Will merge to 'next'. source: <20231031052330.3762989-1-gitster@xxxxxxxxx> * an/clang-format-typofix (2023-11-01) 1 commit (merged to 'next' on 2023-11-02 at 7f639690ab) + clang-format: fix typo in comment Typofix. Will merge to 'master'. source: <pull.1602.v2.git.git.1698759629166.gitgitgadget@xxxxxxxxx> * jk/tree-name-and-depth-limit (2023-11-02) 1 commit - max_tree_depth: lower it for MSVC to avoid stack overflows Further limit tree depth max to avoid Windows build running out of the stack space. Will merge to 'next' and then to 'master'. source: <pull.1604.v2.git.1698843810814.gitgitgadget@xxxxxxxxx> -------------------------------------------------- [Graduated to 'master'] * da/t7601-style-fix (2023-10-18) 1 commit (merged to 'next' on 2023-10-20 at 8e7326458c) + t7601: use "test_path_is_file" etc. instead of "test -f" Coding style update. source: <20231018124538.68549-2-anonolitunya@xxxxxxxxx> * ii/branch-error-messages-update (2023-10-23) 1 commit (merged to 'next' on 2023-10-23 at 3d00599173) + builtin/branch.c: adjust error messages to coding guidelines Error message update. source: <20231023160656.4341-1-isokenjune@xxxxxxxxx> * jc/am-doc-whitespace-action-fix (2023-10-18) 1 commit (merged to 'next' on 2023-10-20 at 9200d39c08) + am: align placeholder for --whitespace option with apply Docfix. source: <xmqqwmvjzeqd.fsf@gitster.g> * jc/attr-tree-config (2023-10-13) 2 commits (merged to 'next' on 2023-10-19 at 202dc1c453) + attr: add attr.tree for setting the treeish to read attributes from + attr: read attributes from HEAD when bare repo The attribute subsystem learned to honor `attr.tree` configuration that specifies which tree to read the .gitattributes files from. source: <pull.1577.v5.git.git.1697218770.gitgitgadget@xxxxxxxxx> * jc/commit-new-underscore-index-fix (2023-10-17) 1 commit (merged to 'next' on 2023-10-22 at 0e4787303d) + commit: do not use cryptic "new_index" in end-user facing messages Message fix. source: <xmqqo7gwvd8c.fsf_-_@gitster.g> * jc/update-list-references-to-lore (2023-10-06) 1 commit (merged to 'next' on 2023-10-19 at 83a721a137) + doc: update list archive reference to use lore.kernel.org Doc update. source: <xmqq7cnz741s.fsf@gitster.g> * jk/send-email-fix-addresses-from-composed-messages (2023-10-20) 3 commits (merged to 'next' on 2023-10-22 at 43221cc3a4) + send-email: handle to/cc/bcc from --compose message + Revert "send-email: extract email-parsing code into a subroutine" + doc/send-email: mention handling of "reply-to" with --compose The codepath to handle recipient addresses `git send-email --compose` learns from the user was completely broken, which has been corrected. source: <20231020100343.GA2194322@xxxxxxxxxxxxxxxxxxxxxxx> * jm/bisect-run-synopsis-fix (2023-10-23) 1 commit (merged to 'next' on 2023-10-23 at 8dfa3ed356) + doc/git-bisect: clarify `git bisect run` syntax Doc and usage message update. source: <pull.1602.v2.git.1698088990478.gitgitgadget@xxxxxxxxx> * kh/pathspec-error-wo-repository-fix (2023-10-20) 1 commit (merged to 'next' on 2023-10-22 at 4f77af1e40) + grep: die gracefully when outside repository The pathspec code carelessly dereferenced NULL while emitting an error message, which has been corrected. source: <5c8ef6bec1c99e0fae7ada903885a8e77f8137f9.1697819838.git.code@xxxxxxxxxxxxxxx> * mm/p4-symlink-with-lfs (2023-10-19) 1 commit (merged to 'next' on 2023-10-20 at 9c05ce7e85) + git-p4 shouldn't attempt to store symlinks in LFS "git p4" tried to store symlinks to LFS when told, but has been fixed not to do so, because it does not make sense. source: <20231019002558.867830-1-mmcclain@xxxxxxxxxxx> * ms/doc-push-fix (2023-10-20) 1 commit (merged to 'next' on 2023-10-22 at 7ce3cef56b) + git-push doc: more visibility for -q option Docfix. source: <20231020184627.14336-1-msuchanek@xxxxxxx> * ni/die-message-fix-for-git-add (2023-10-17) 1 commit (merged to 'next' on 2023-10-22 at f46c5dfd63) + builtin/add.c: clean up die() messages Message updates. source: <20231017113946.747-1-naomi.ibeh69@xxxxxxxxx> * ob/rebase-cleanup (2023-10-20) 3 commits (merged to 'next' on 2023-10-22 at 05e14ca4fc) + rebase: move parse_opt_keep_empty() down + rebase: handle --strategy via imply_merge() as well + rebase: simplify code related to imply_merge() Code clean-up. source: <20231020093654.922890-1-oswald.buddenhagen@xxxxxx> * ps/git-repack-doc-fixes (2023-10-16) 2 commits (merged to 'next' on 2023-10-22 at df64849f26) + doc/git-repack: don't mention nonexistent "--unpacked" option + doc/git-repack: fix syntax for `-g` shorthand option Doc updates. source: <cover.1697440686.git.ps@xxxxxx> * sn/typo-grammo-phraso-fixes (2023-10-05) 5 commits (merged to 'next' on 2023-10-18 at 575d767f9a) + t/README: fix multi-prerequisite example + doc/gitk: s/sticked/stuck/ + git-jump: admit to passing merge mode args to ls-files + doc/diff-options: improve wording of the log.diffMerges mention + doc: fix some typos, grammar and wording issues Many typos, ungrammatical sentences and wrong phrasing have been fixed. source: <20231003082107.3002173-1-stepnem@xxxxxxxx> * wx/merge-ort-comment-typofix (2023-10-21) 1 commit (merged to 'next' on 2023-10-22 at ad1e33883a) + merge-ort.c: fix typo 'neeed' to 'needed' Typofix. source: <pull.1592.v3.git.git.1697942768555.gitgitgadget@xxxxxxxxx> -------------------------------------------------- [Stalled] * pw/rebase-sigint (2023-09-07) 1 commit - rebase -i: ignore signals when forking subprocesses If the commit log editor or other external programs (spawned via "exec" insn in the todo list) receive internactive signal during "git rebase -i", it caused not just the spawned program but the "Git" process that spawned them, which is often not what the end user intended. "git" learned to ignore SIGINT and SIGQUIT while waiting for these subprocesses. Expecting a reroll. cf. <12c956ea-330d-4441-937f-7885ab519e26@xxxxxxxxx> source: <pull.1581.git.1694080982621.gitgitgadget@xxxxxxxxx> * tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit - cherry-pick: refuse cherry-pick sequence if index is dirty "git cherry-pick A" that replays a single commit stopped before clobbering local modification, but "git cherry-pick A..B" did not, which has been corrected. Expecting a reroll. cf. <999f12b2-38d6-f446-e763-4985116ad37d@xxxxxxxxx> source: <pull.1535.v2.git.1685264889088.gitgitgadget@xxxxxxxxx> * jc/diff-cached-fsmonitor-fix (2023-09-15) 3 commits - diff-lib: fix check_removed() when fsmonitor is active - Merge branch 'jc/fake-lstat' into jc/diff-cached-fsmonitor-fix - Merge branch 'js/diff-cached-fsmonitor-fix' into jc/diff-cached-fsmonitor-fix (this branch uses jc/fake-lstat.) The optimization based on fsmonitor in the "diff --cached" codepath is resurrected with the "fake-lstat" introduced earlier. It is unknown if the optimization is worth resurrecting, but in case... source: <xmqqr0n0h0tw.fsf@gitster.g> -------------------------------------------------- [Cooking] * ar/submitting-patches-doc-update (2023-10-24) 1 commit (merged to 'next' on 2023-10-30 at e140009eb6) + SubmittingPatches: call gitk's command "Copy commit reference" Doc update. Will merge to 'master'. source: <20231024195123.911431-1-rybak.a.v@xxxxxxxxx> * es/bugreport-no-extra-arg (2023-10-29) 2 commits (merged to 'next' on 2023-11-01 at 4ca0a9c77c) + bugreport: reject positional arguments + t0091-bugreport: stop using i18ngrep "git bugreport" learned to complain when it received a command line argument that it will not use. Will merge to 'master'. source: <20231026155459.2234929-1-nasamuffin@xxxxxxxxxx> * js/my-first-contribution-update (2023-10-28) 1 commit (merged to 'next' on 2023-11-01 at 94590ee724) + Include gettext.h in MyFirstContribution tutorial Documentation update. Will merge to 'master'. source: <20231017041503.3249-1-jacob@xxxxxxxxxxxxxxxx> * ms/send-email-validate-fix (2023-10-26) 1 commit (merged to 'next' on 2023-11-01 at f9dd32186b) + send-email: move validation code below process_address_list "git send-email" did not have certain pieces of data computed yet when it tried to validate the outging messages and its recipient addresses, which has been sorted out. Will merge to 'master'. source: <ddd4bfdd-ed14-44f4-89d3-192332bbc1c4@xxxxxxx> * ps/ci-gitlab (2023-11-02) 8 commits - ci: add support for GitLab CI - ci: install test dependencies for linux-musl - ci: squelch warnings when testing with unusable Git repo - ci: unify setup of some environment variables - ci: split out logic to set up failed test artifacts - ci: group installation of Docker dependencies - ci: make grouping setup more generic - ci: reorder definitions for grouping functions Add support for GitLab CI. Comments? source: <cover.1698843660.git.ps@xxxxxx> * ps/ref-tests-update (2023-10-24) 9 commits - t: mark several tests that assume the files backend with REFFILES - t7900: assert the absence of refs via git-for-each-ref(1) - t7300: assert exact states of repo - t4207: delete replace references via git-update-ref(1) - t1450: convert tests to remove worktrees via git-worktree(1) - t: convert tests to not access reflog via the filesystem - t: convert tests to not access symrefs via the filesystem - t: convert tests to not write references via the filesystem - t: allow skipping expected object ID in `ref-store update-ref` Update ref-related tests. Will merge to 'next'? source: <cover.1698156169.git.ps@xxxxxx> * rs/fix-arghelp (2023-10-29) 1 commit (merged to 'next' on 2023-11-01 at cd923d3362) + am, rebase: fix arghelp syntax of --empty Doc and help update. Will merge to 'master'. source: <10e09b2d-15d7-4af1-b24c-217f9e2f457a@xxxxxx> * rs/parse-options-cmdmode (2023-10-29) 2 commits (merged to 'next' on 2023-11-01 at b83328f1e7) + am: simplify --show-current-patch handling + parse-options: make CMDMODE errors more precise parse-options improvements for OPT_CMDMODE options. Will merge to 'master'. source: <4520156b-9418-493c-a50c-e61b42e805b3@xxxxxx> * rs/reflog-expire-single-worktree-fix (2023-10-29) 1 commit (merged to 'next' on 2023-11-01 at 6b4dab2cd2) + reflog: fix expire --single-worktree "git reflog expire --single-worktree" has been broken for the past 20 months or so, which has been corrected. Will merge to 'master'. source: <63eade0e-bf2c-4906-8b4c-689797cff737@xxxxxx> * jx/fetch-atomic-error-message-fix (2023-10-19) 2 commits - fetch: no redundant error message for atomic fetch - t5574: test porcelain output of atomic fetch "git fetch --atomic" issued an unnecessary empty error message, which has been corrected. Needs review. source: <ced46baeb1c18b416b4b4cc947f498bea2910b1b.1697725898.git.zhiyou.jx@xxxxxxxxxxxxxxx> * js/bugreport-in-the-same-minute (2023-10-16) 1 commit - bugreport: include +i in outfile suffix as needed Instead of auto-generating a filename that is already in use for output and fail the command, `git bugreport` learned to fuzz the filename to avoid collisions with existing files. Expecting a reroll. cf. <ZTtZ5CbIGETy1ucV.jacob@xxxxxxxxxxxxxxxx> source: <20231016214045.146862-2-jacob@xxxxxxxxxxxxxxxx> * kh/t7900-cleanup (2023-10-17) 9 commits - t7900: fix register dependency - t7900: factor out packfile dependency - t7900: fix `print-args` dependency - t7900: fix `pfx` dependency - t7900: factor out common schedule setup - t7900: factor out inheritance test dependency - t7900: create commit so that branch is born - t7900: setup and tear down clones - t7900: remove register dependency Test clean-up. Perhaps discard? cf. <655ca147-c214-41be-919d-023c1b27b311@xxxxxxxxxxxxxxxx> source: <cover.1697319294.git.code@xxxxxxxxxxxxxxx> * tb/merge-tree-write-pack (2023-10-23) 5 commits - builtin/merge-tree.c: implement support for `--write-pack` - bulk-checkin: introduce `index_tree_bulk_checkin_incore()` - bulk-checkin: introduce `index_blob_bulk_checkin_incore()` - bulk-checkin: generify `stream_blob_to_pack()` for arbitrary types - bulk-checkin: extract abstract `bulk_checkin_source` "git merge-tree" learned "--write-pack" to record its result without creating loose objects. Will merge to 'next'? source: <cover.1698101088.git.me@xxxxxxxxxxxx> * tb/format-pack-doc-update (2023-11-01) 2 commits (merged to 'next' on 2023-11-02 at 538991fe9b) + Documentation/gitformat-pack.txt: fix incorrect MIDX documentation + Documentation/gitformat-pack.txt: fix typo Doc update. Will merge to 'master'. source: <cover.1698780244.git.me@xxxxxxxxxxxx> * ps/do-not-trust-commit-graph-blindly-for-existence (2023-11-01) 2 commits (merged to 'next' on 2023-11-01 at 06037376ee) + commit: detect commits that exist in commit-graph but not in the ODB + commit-graph: introduce envvar to disable commit existence checks (this branch is used by kn/rev-list-missing-fix.) The codepath to traverse the commit-graph learned to notice that a commit is missing (e.g., corrupt repository lost an object), even though it knows something about the commit (like its parents) from what is in commit-graph. Will merge to 'master'. source: <cover.1698736363.git.ps@xxxxxx> * tb/pair-chunk-expect-size (2023-10-14) 8 commits - midx: read `OOFF` chunk with `pair_chunk_expect()` - midx: read `OIDL` chunk with `pair_chunk_expect()` - midx: read `OIDF` chunk with `pair_chunk_expect()` - commit-graph: read `BIDX` chunk with `pair_chunk_expect()` - commit-graph: read `GDAT` chunk with `pair_chunk_expect()` - commit-graph: read `CDAT` chunk with `pair_chunk_expect()` - commit-graph: read `OIDF` chunk with `pair_chunk_expect()` - chunk-format: introduce `pair_chunk_expect()` helper Code clean-up for jk/chunk-bounds topic. Comments? source: <45cac29403e63483951f7766c6da3c022c68d9f0.1697225110.git.me@xxxxxxxxxxxx> source: <cover.1697225110.git.me@xxxxxxxxxxxx> * jc/grep-f-relative-to-cwd (2023-10-12) 1 commit (merged to 'next' on 2023-10-31 at 0d32547b18) + grep: -f <path> is relative to $cwd "cd sub && git grep -f patterns" tried to read "patterns" file at the top level of the working tree; it has been corrected to read "sub/patterns" instead. Will merge to 'master'. cf. <ZUAnEVk65VQQE263@nand.local> source: <xmqqedhzg37z.fsf@gitster.g> * tb/path-filter-fix (2023-10-18) 17 commits - bloom: introduce `deinit_bloom_filters()` - commit-graph: reuse existing Bloom filters where possible - object.h: fix mis-aligned flag bits table - commit-graph: drop unnecessary `graph_read_bloom_data_context` - commit-graph.c: unconditionally load Bloom filters - bloom: prepare to discard incompatible Bloom filters - bloom: annotate filters with hash version - commit-graph: new filter ver. that fixes murmur3 - repo-settings: introduce commitgraph.changedPathsVersion - t4216: test changed path filters with high bit paths - t/helper/test-read-graph: implement `bloom-filters` mode - bloom.h: make `load_bloom_filter_from_graph()` public - t/helper/test-read-graph.c: extract `dump_graph_info()` - gitformat-commit-graph: describe version 2 of BDAT - commit-graph: ensure Bloom filters are read with consistent settings - revision.c: consult Bloom filters for root commits - t/t4216-log-bloom.sh: harden `test_bloom_filters_not_used()` The Bloom filter used for path limited history traversal was broken on systems whose "char" is unsigned; update the implementation and bump the format version to 2. Needs (hopefully final and quick) review. source: <cover.1697653929.git.me@xxxxxxxxxxxx> * kn/rev-list-missing-fix (2023-11-01) 4 commits (merged to 'next' on 2023-11-02 at 2469dfc402) + rev-list: add commit object support in `--missing` option + rev-list: move `show_commit()` to the bottom + revision: rename bit to `do_not_die_on_missing_objects` + Merge branch 'ps/do-not-trust-commit-graph-blindly-for-existence' into kn/rev-list-missing-fix (this branch uses ps/do-not-trust-commit-graph-blindly-for-existence.) "git rev-list --missing" did not work for missing commit objects, which has been corrected. Will merge to 'master'. source: <20231026101109.43110-1-karthik.188@xxxxxxxxx> * cc/git-replay (2023-10-10) 14 commits - replay: stop assuming replayed branches do not diverge - replay: add --contained to rebase contained branches - replay: add --advance or 'cherry-pick' mode - replay: use standard revision ranges - replay: make it a minimal server side command - replay: remove HEAD related sanity check - replay: remove progress and info output - replay: add an important FIXME comment about gpg signing - replay: change rev walking options - replay: introduce pick_regular_commit() - replay: die() instead of failing assert() - replay: start using parse_options API - replay: introduce new builtin - t6429: remove switching aspects of fast-rebase Introduce "git replay", a tool meant on the server side without working tree to recreate a history. Expectting a (hopefully final and quick) reroll. cf. <bd872b81-80a9-5e4e-dcb6-faebc9671848@xxxxxx> source: <20231010123847.2777056-1-christian.couder@xxxxxxxxx> * ak/color-decorate-symbols (2023-10-23) 7 commits - log: add color.decorate.pseudoref config variable - refs: exempt pseudorefs from pattern prefixing - refs: add pseudorefs array and iteration functions - log: add color.decorate.ref config variable - log: add color.decorate.symbol config variable - log: use designated inits for decoration_colors - config: restructure color.decorate documentation A new config for coloring. Needs review. source: <20231023221143.72489-1-andy.koppe@xxxxxxxxx> * js/update-urls-in-doc-and-comment (2023-09-26) 4 commits - doc: refer to internet archive - doc: update links for andre-simon.de - doc: update links to current pages - doc: switch links to https Stale URLs have been updated to their current counterparts (or archive.org) and HTTP links are replaced with working HTTPS links. Needs review. source: <pull.1589.v2.git.1695553041.gitgitgadget@xxxxxxxxx> * la/trailer-cleanups (2023-10-20) 3 commits - trailer: use offsets for trailer_start/trailer_end - trailer: find the end of the log message - commit: ignore_non_trailer computes number of bytes to ignore Code clean-up. Will merge to 'next'? source: <pull.1563.v5.git.1697828495.gitgitgadget@xxxxxxxxx> * eb/hash-transition (2023-10-02) 30 commits - t1016-compatObjectFormat: add tests to verify the conversion between objects - t1006: test oid compatibility with cat-file - t1006: rename sha1 to oid - test-lib: compute the compatibility hash so tests may use it - builtin/ls-tree: let the oid determine the output algorithm - object-file: handle compat objects in check_object_signature - tree-walk: init_tree_desc take an oid to get the hash algorithm - builtin/cat-file: let the oid determine the output algorithm - rev-parse: add an --output-object-format parameter - repository: implement extensions.compatObjectFormat - object-file: update object_info_extended to reencode objects - object-file-convert: convert commits that embed signed tags - object-file-convert: convert commit objects when writing - object-file-convert: don't leak when converting tag objects - object-file-convert: convert tag objects when writing - object-file-convert: add a function to convert trees between algorithms - object: factor out parse_mode out of fast-import and tree-walk into in object.h - cache: add a function to read an OID of a specific algorithm - tag: sign both hashes - commit: export add_header_signature to support handling signatures on tags - commit: convert mergetag before computing the signature of a commit - commit: write commits for both hashes - object-file: add a compat_oid_in parameter to write_object_file_flags - object-file: update the loose object map when writing loose objects - loose: compatibilty short name support - loose: add a mapping between SHA-1 and SHA-256 for loose objects - repository: add a compatibility hash algorithm - object-names: support input of oids in any supported hash - oid-array: teach oid-array to handle multiple kinds of oids - object-file-convert: stubs for converting from one object format to another Teach a repository to work with both SHA-1 and SHA-256 hash algorithms. Needs review. source: <878r8l929e.fsf@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx> * jx/remote-archive-over-smart-http (2023-10-04) 4 commits - archive: support remote archive from stateless transport - transport-helper: call do_take_over() in connect_helper - transport-helper: call do_take_over() in process_connect - transport-helper: no connection restriction in connect_helper "git archive --remote=<remote>" learned to talk over the smart http (aka stateless) transport. Needs review. source: <cover.1696432593.git.zhiyou.jx@xxxxxxxxxxxxxxx> * jx/sideband-chomp-newline-fix (2023-10-04) 3 commits - pkt-line: do not chomp newlines for sideband messages - pkt-line: memorize sideband fragment in reader - test-pkt-line: add option parser for unpack-sideband Sideband demultiplexer fixes. Needs review. source: <cover.1696425168.git.zhiyou.jx@xxxxxxxxxxxxxxx> * js/config-parse (2023-09-21) 5 commits - config-parse: split library out of config.[c|h] - config.c: accept config_parse_options in git_config_from_stdin - config: report config parse errors using cb - config: split do_event() into start and flush operations - config: split out config_parse_options The parsing routines for the configuration files have been split into a separate file. Needs review. source: <cover.1695330852.git.steadmon@xxxxxxxxxx> * jc/fake-lstat (2023-09-15) 1 commit - cache: add fake_lstat() (this branch is used by jc/diff-cached-fsmonitor-fix.) A new helper to let us pretend that we called lstat() when we know our cache_entry is up-to-date via fsmonitor. Needs review. source: <xmqqcyykig1l.fsf@gitster.g> * js/doc-unit-tests (2023-11-02) 3 commits - ci: run unit tests in CI - unit tests: add TAP unit test framework - unit tests: add a project plan document (this branch is used by js/doc-unit-tests-with-cmake.) Process to add some form of low-level unit tests has started. Will merge to 'next'? source: <cover.1698881249.git.steadmon@xxxxxxxxxx> * js/doc-unit-tests-with-cmake (2023-11-02) 7 commits - cmake: handle also unit tests - cmake: use test names instead of full paths - cmake: fix typo in variable name - artifacts-tar: when including `.dll` files, don't forget the unit-tests - unit-tests: do show relative file paths - unit-tests: do not mistake `.pdb` files for being executable - cmake: also build unit tests (this branch uses js/doc-unit-tests.) Update the base topic to work with CMake builds. Will merge to 'next'? source: <pull.1579.v3.git.1695640836.gitgitgadget@xxxxxxxxx> * jc/rerere-cleanup (2023-08-25) 4 commits - rerere: modernize use of empty strbuf - rerere: try_merge() should use LL_MERGE_ERROR when it means an error - rerere: fix comment on handle_file() helper - rerere: simplify check_one_conflict() helper function Code clean-up. Not ready to be reviewed yet. source: <20230824205456.1231371-1-gitster@xxxxxxxxx> * rj/status-bisect-while-rebase (2023-10-16) 1 commit - status: fix branch shown when not only bisecting "git status" is taught to show both the branch being bisected and being rebased when both are in effect at the same time. Needs review. source: <2e24ca9b-9c5f-f4df-b9f8-6574a714dfb2@xxxxxxxxx> -------------------------------------------------- [Discarded] * rs/parse-options-value-int (2023-09-18) 2 commits . parse-options: use and require int pointer for OPT_CMDMODE . parse-options: add int value pointer to struct option A bit of type safety for the "value" pointer used in the parse-options API. Retracted. cf. <4014e490-c6c1-453d-b0ed-645220e3e614@xxxxxx> source: <e6d8a291-03de-cfd3-3813-747fc2cad145@xxxxxx>
