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. 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/squelch-empty-fsync-traces (2022-07-18) 1 commit (merged to 'next' on 2022-07-19 at f77cd40c29) + trace2: only include "fsync" events if we git_fsync() Omit fsync-related trace2 entries when their values are all zero. source: <patch-v3-1.1-979dea5956a-20220718T102747Z-avarab@xxxxxxxxx> * ds/doc-wo-whitelist (2022-07-19) 5 commits (merged to 'next' on 2022-07-20 at ec51c6269a) + transport.c: avoid "whitelist" + t: avoid "whitelist" + git.txt: remove redundant language + git-cvsserver: clarify directory list + daemon: clarify directory arguments Avoid "white/black-list" in documentation and code comments. source: <pull.1274.v3.git.1658255537.gitgitgadget@xxxxxxxxx> * ds/win-syslog-compiler-fix (2022-07-19) 1 commit (merged to 'next' on 2022-07-20 at d38b649b18) + compat/win32: correct for incorrect compiler warning Workaround for a false positive compiler warning. source: <pull.1294.git.1658256354725.gitgitgadget@xxxxxxxxx> * js/commit-graph-parsing-without-repo-settings (2022-07-14) 1 commit (merged to 'next' on 2022-07-19 at bcc29d823d) + commit-graph: pass repo_settings instead of repository API tweak to make it easier to run fuzz testing on commit-graph parser. source: <fd70b6119153b165a62ee4f693dbe47031cfb2be.1657834657.git.steadmon@xxxxxxxxxx> * ld/osx-keychain-usage-fix (2022-07-19) 1 commit (merged to 'next' on 2022-07-20 at eebd316ef6) + osx-keychain: fix compiler warning Workaround for a compiler warning against use of die() in osx-keychain (in contrib/). source: <pull.1293.git.1658251503775.gitgitgadget@xxxxxxxxx> * ma/sparse-checkout-cone-doc-fix (2022-07-18) 1 commit (merged to 'next' on 2022-07-19 at c259b61b0e) + config/core.txt: fix minor issues for `core.sparseCheckoutCone` Docfix. source: <20220718100530.2068354-1-martin.agren@xxxxxxxxx> * ma/t4200-update (2022-07-18) 1 commit (merged to 'next' on 2022-07-19 at 710d0cafd9) + t4200: drop irrelevant code Test fix. source: <20220718154322.2177166-1-martin.agren@xxxxxxxxx> * mb/config-document-include (2022-07-17) 1 commit (merged to 'next' on 2022-07-19 at 8267b80aa2) + config.txt: document include, includeIf Add missing documentation for "include" and "includeIf" features in "git config" file format, which incidentally teaches the command line completion to include them in its offerings. source: <pull.1285.v2.git.1658002423864.gitgitgadget@xxxxxxxxx> * mb/p4-fixes (2022-07-20) 2 commits (merged to 'next' on 2022-07-20 at 7942d72b1c) + git-p4: fix error handling in P4Unshelve.renameBranch() + git-p4: fix typo in P4Submit.applyCommit() Fix a few issues in "git p4". source: <pull.1297.v2.git.git.1658343330.gitgitgadget@xxxxxxxxx> * mb/p4-utf16-crlf (2022-07-20) 1 commit (merged to 'next' on 2022-07-20 at c2fedd2fc2) + git-p4: fix CR LF handling for utf16 files "git p4" working on UTF-16 files on Windows did not implement CRLF-to-LF conversion correctly, which has been corrected. source: <pull.1294.v2.git.git.1658341065221.gitgitgadget@xxxxxxxxx> * sg/index-format-doc-update (2022-07-18) 1 commit (merged to 'next' on 2022-07-19 at ccc384be5e) + index-format.txt: remove outdated list of supported extensions Docfix. source: <20220718085640.7395-1-szeder.dev@xxxxxxxxx> * tl/pack-bitmap-error-messages (2022-07-18) 6 commits (merged to 'next' on 2022-07-19 at 3f9565653a) + pack-bitmap.c: continue looping when first MIDX bitmap is found + pack-bitmap.c: using error() instead of silently returning -1 + pack-bitmap.c: do not ignore error when opening a bitmap file + pack-bitmap.c: rename "idx_name" to "bitmap_name" + pack-bitmap.c: mark more strings for translations + pack-bitmap.c: fix formatting of error messages Tweak various messages that come from the pack-bitmap codepaths. source: <cover.1658159745.git.dyroneteng@xxxxxxxxx> * vd/scalar-doc (2022-07-18) 2 commits (merged to 'next' on 2022-07-20 at fab0234da4) + scalar: convert README.md into a technical design doc + scalar: reword command documentation to clarify purpose Doc update. source: <pull.1275.v2.git.1657584367.gitgitgadget@xxxxxxxxx> -------------------------------------------------- [New Topics] * tb/cat-file-z (2022-07-22) 2 commits (merged to 'next' on 2022-07-28 at 78731f0fdb) + builtin/cat-file.c: support NUL-delimited input with `-z` + t1006: extract --batch-command inputs to variables Operating modes like "--batch" of "git cat-file" command learned to take NUL-terminated input, instead of one-item-per-line. Will merge to 'master'. source: <cover.1658532524.git.me@xxxxxxxxxxxx> * ab/tech-docs-to-help (2022-07-23) 9 commits - docs: move multi-pack-index docs to man section 5 - docs: move http-protocol docs to man section 5 - docs: move pack format docs to man section 5 - docs: move protocol-related docs to man section 5 - docs: move commit-graph format docs to man section 5 - git docs: add a category for file formats, protocols and interfaces - git docs: add a category for user-facing file, repo and command UX - git help doc: use "<doc>" instead of "<guide>" - help.c: BUG() out if "help --guides" can't remove "git" prefixes Expose a lot of "tech docs" via "git help" interface. source: <cover-v5-0.9-00000000000-20220721T160721Z-avarab@xxxxxxxxx> * sg/parse-options-subcommand (2022-07-25) 20 commits - builtin/worktree.c: let parse-options parse subcommands - builtin/stash.c: let parse-options parse subcommands - builtin/sparse-checkout.c: let parse-options parse subcommands - builtin/remote.c: let parse-options parse subcommands - builtin/reflog.c: let parse-options parse subcommands - builtin/notes.c: let parse-options parse subcommands - builtin/multi-pack-index.c: let parse-options parse subcommands - builtin/hook.c: let parse-option parse subcommands - builtin/gc.c: let parse-options parse 'git maintenance's subcommands - builtin/commit-graph.c: let parse-options parse subcommands - builtin/bundle.c: let parse-options parse subcommands - parse-options: add support for parsing subcommands - parse-options: drop leading space from '--git-completion-helper' output - parse-options: clarify the limitations of PARSE_OPT_NODASH - parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --options - api-parse-options.txt: fix description of OPT_CMDMODE - t0040-parse-options: test parse_options() with various 'parse_opt_flags' - t5505-remote.sh: check the behavior without a subcommand - t3301-notes.sh: check that default operation mode doesn't take arguments - git.c: update NO_PARSEOPT markings Introduce the "subcommand" mode to parse-options API and update the command line parser of Git commands with subcommands. source: <20220725123857.2773963-1-szeder.dev@xxxxxxxxx> * ds/bundle-uri-clone (2022-07-25) 5 commits - clone: --bundle-uri cannot be combined with --depth - bundle-uri: add support for http(s):// and file:// - clone: add --bundle-uri option - bundle-uri: create basic file-copy logic - remote-curl: add 'get' capability Implement "git clone --bundle-uri". source: <pull.1300.git.1658781277.gitgitgadget@xxxxxxxxx> * ca/unignore-local-installation-on-windows (2022-07-27) 1 commit - cmake: support local installations of git Fix build procedure for Windows that uses CMake so that it can pick up the shell interpreter from local installation location. Will merge to 'next'. source: <pull.1304.git.1658912756815.gitgitgadget@xxxxxxxxx> * ds/decorate-filter-tweak (2022-07-29) 10 commits - fetch: use ref_namespaces during prefetch - maintenance: stop writing log.excludeDecoration - log: create log.decorateFilter=all - log: add --decorate-all option - log: add default decoration filter - log-tree: use ref_namespaces instead of if/else-if - refs: use ref_namespaces for replace refs base - refs: add array of ref namespaces - t4207: test coloring of grafted decorations - refs: allow "HEAD" as decoration filter The namespaces used by "log --decorate" from "refs/" hierarchy by default has been tightened. source: <pull.1301.v2.git.1659122979.gitgitgadget@xxxxxxxxx> * gc/bare-repo-discovery (2022-07-26) 1 commit (merged to 'next' on 2022-07-28 at 1d2bef98f6) + config.c: NULL check when reading protected config Fix-up for what has been merged to 'master' recently. Will merge to 'master'. source: <pull.1299.v2.git.git.1658874067077.gitgitgadget@xxxxxxxxx> * jr/gitweb-title-shortening (2022-07-26) 1 commit (merged to 'next' on 2022-07-28 at 7528e87220) + gitweb: remove title shortening heuristics Gitweb had legacy URL shortener that is specific to the way projects hosted on kernel.org used to (but no longer) work, which has been removed. Will merge to 'master'. source: <20220726135911.ycvgwbkixb3ei6w3@jrouhaud> * 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. source: <7229p500-p2r4-on87-6802-8o90s36rr3s4@xxxxxx> * js/lstat-mingw-enotdir-fix (2022-07-29) 1 commit - lstat(mingw): correctly detect ENOTDIR scenarios Fix to lstat() emulation on Windows. Will merge to 'next'. source: <pull.1291.v3.git.1659089152877.gitgitgadget@xxxxxxxxx> * js/mingw-with-python (2022-07-29) 3 commits - mingw: remove unneeded `NO_CURL` directive - mingw: remove unneeded `NO_GETTEXT` directive - windows: include the Python bits when building Git for Windows Conditionally allow building Python interpreter on Windows Will merge to 'next'. source: <pull.1306.v2.git.1659109272.gitgitgadget@xxxxxxxxx> * ab/submodule-helper-prep (2022-07-28) 20 commits - submodule--helper: fix bad config API usage - submodule--helper: don't exit() on failure, return - submodule--helper: add skeleton "goto cleanup" to update_submodule() - submodule--helper: rename "int res" to "int ret" - submodule--helper: refactor "errmsg_str" to be a "struct strbuf" - submodule--helper: add "const" to copy of "update_data" - submodule--helper: pass a "const struct module_clone_data" to clone_submodule() - submodule--helper: stop conflating "sb" in clone_submodule() - submodule--helper: convert a strbuf_detach() to xstrfmt() - submodule--helper: replace memset() with { 0 }-initialization - submodule--helper style: add \n\n after variable declarations - submodule--helper style: don't separate declared variables with \n\n - submodule--helper: move "resolve-relative-url-test" to a test-tool - submodule--helper: move "check-name" to a test-tool - submodule--helper: move "is-active" to a test-tool - test-tool submodule-config: remove unused "--url" handling - submodule--helper: remove unused "list" helper - submodule--helper: remove unused "name" helper - submodule tests: test for "add <repository> <abs-path>" - submodule tests: test usage behavior (this branch is used by ab/submodule-helper-leakfix.) source: <cover-00.20-00000000000-20220728T161116Z-avarab@xxxxxxxxx> * ab/dedup-config-and-command-docs (2022-07-29) 9 commits - docs: add CONFIGURATION sections that fuzzy map to built-ins - docs: add CONFIGURATION sections that map to a built-in - log docs: de-duplicate configuration sections - difftool docs: de-duplicate configuration sections - notes docs: de-duplicate configuration sections - apply docs: de-duplicate configuration sections - send-email docs: de-duplicate configuration sections - grep docs: de-duplicate configuration sections - docs: add and use include template for config/* includes Share the text used to explain configuration variables used by "git <subcmd>" in "git help <subcmd>" with the text from "git help config". Will merge to 'next'? source: <cover-v2-0.9-00000000000-20220729T081959Z-avarab@xxxxxxxxx> * jk/struct-zero-init-with-older-gcc (2022-07-29) 1 commit - config.mak.dev: squelch -Wno-missing-braces for older gcc Older gcc with -Wall complains about the universal zero initializer "struct s = { 0 };" idiom, which makes developers' lives inconvenient (as -Werror is enabled by DEVELOPER=YesPlease). The build procedure has been tweaked to help them with thes compilers. Will merge to 'next'. source: <YuQ60ZUPBHAVETD7@xxxxxxxxxxxxxxxxxxxxxxx> * js/ort-clean-up-after-failed-merge (2022-07-29) 2 commits - merge-ort: do leave trace2 region even if checkout fails - merge-ort: clean up after failed merge Plug memory leaks in the failure code path in the "merge-ort" merge strategy backend. Will merge to 'next'? source: <pull.1307.v2.git.1659114727.gitgitgadget@xxxxxxxxx> * js/t5351-freebsd-fix (2022-07-29) 2 commits - t5351: avoid using `test_cmp` for binary data - t5351: avoid relying on `core.fsyncMethod = batch` to be supported Some tests assumed that core.fsyncMethod=batch is supported everywhere, which broke FreeBSD. Will merge to 'next'. source: <pull.1308.git.1659097724.gitgitgadget@xxxxxxxxx> -------------------------------------------------- [Stalled] * tk/apply-case-insensitive (2022-06-21) 3 commits - apply: support case-only renames in case-insensitive filesystems - reset: new failing test for reset of case-insensitive duplicate in index - t4141: test "git apply" with core.ignorecase "git apply" barfed on a patch that makes a case-only rename on a case-insensitive filesystem. Needs review. source: <pull.1257.v2.git.1655655027.gitgitgadget@xxxxxxxxx> * bc/stash-export (2022-04-08) 4 commits - builtin/stash: provide a way to import stashes from a ref - builtin/stash: provide a way to export stashes to a ref - builtin/stash: factor out revision parsing into a function - object-name: make get_oid quietly return an error A mechanism to export and import stash entries to and from a normal commit to transfer it across repositories has been introduced. Expecting a reroll. cf. <YnL2d4Vr9Vr7W4Hj@xxxxxxxxxxxxxxxxxxxxxxxxx> source: <20220407215352.3491567-1-sandals@xxxxxxxxxxxxxxxxxxxx> -------------------------------------------------- [Cooking] * cw/remote-object-info (2022-07-28) 6 commits - 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. source: <20220728230210.2952731-1-calvinwan@xxxxxxxxxx> * ab/leak-check (2022-07-27) 15 commits - CI: use "GIT_TEST_SANITIZE_LEAK_LOG=true" in linux-leaks - upload-pack: fix a memory leak in create_pack_file() - leak tests: mark passing SANITIZE=leak tests as leak-free - leak tests: don't skip some tests under SANITIZE=leak - test-lib: have the "check" mode for SANITIZE=leak consider leak logs - test-lib: add a GIT_TEST_PASSING_SANITIZE_LEAK=check mode - test-lib: simplify by removing test_external - tests: move copy/pasted PERL + Test::More checks to a lib-perl.sh - t/Makefile: don't remove test-results in "clean-except-prove-cache" - test-lib: add a SANITIZE=leak logging mode - t/README: reword the "GIT_TEST_PASSING_SANITIZE_LEAK" description - test-lib: add a --invert-exit-code switch - test-lib: fix GIT_EXIT_OK logic errors, use BAIL_OUT - test-lib: don't set GIT_EXIT_OK before calling test_atexit_handler - test-lib: use $1, not $@ in test_known_broken_{ok,failure}_ Plugging more leaks. source: <cover-v3-00.15-00000000000-20220727T230800Z-avarab@xxxxxxxxx> * jc/string-list-cleanup (2022-07-20) 1 commit (merged to 'next' on 2022-07-27 at 858a0b2a28) + builtin/remote.c: use the right kind of STRING_LIST_INIT Code clean-up. Will merge to 'master'. source: <xmqq7d471dns.fsf@gitster.g> * mt/pkt-line-comment-tweak (2022-07-22) 1 commit (merged to 'next' on 2022-07-22 at 4004fa75eb) + pkt-line.h: move comment closer to the associated code In-code comment clarification. Will merge to 'master'. source: <6a14443c101fa132498297af6d7a483520688d75.1658488203.git.matheus.bernardino@xxxxxx> * mt/rot13-in-c (2022-07-24) 2 commits - t/t0021: convert the rot13-filter.pl script to C - Merge branch 'mt/checkout-count-fix' into mt/rot13-in-c (this branch uses mt/checkout-count-fix.) Test portability improvements. Needs review. source: <f38f722de7c3323207eda5ea632b5acd3765c285.1658675222.git.matheus.bernardino@xxxxxx> * tk/untracked-cache-with-uall (2022-07-22) 1 commit (merged to 'next' on 2022-07-25 at b792dd5012) + read-cache: make `do_read_index()` always set up `istate->repo` Fix for a bug that makes write-tree to fail to write out a non-existent index as a tree, introduced in 2.37. Will merge to 'master'. source: <20220722212232.833188-1-martin.agren@xxxxxxxxx> * ds/midx-with-less-memory (2022-07-27) 4 commits (merged to 'next' on 2022-07-27 at 9ac7aed9f6) + write_midx_bitmap(): drop unused refs_snapshot parameter (merged to 'next' on 2022-07-20 at 250d257c3e) + midx: reduce memory pressure while writing bitmaps + midx: extract bitmap write setup + pack-bitmap-write: use const for hashes The codepath to write multi-pack index has been taught to release a large chunk of memory that holds an array of objects in the packs, as soon as it is done with the array, to reduce memory consumption. Will merge to 'master'. source: <pull.1292.v2.git.1658244366.gitgitgadget@xxxxxxxxx> * tl/trace2-config-scope (2022-07-22) 2 commits - tr2: shows scope unconditionally in addition to key-value pair - api-trace2.txt: print config key-value pair Tweak trace2 output about configuration variables. Expecting a reroll. cf. <220722.86fsits91m.gmgdl@xxxxxxxxxxxxxxxxxxx> source: <cover.1658472474.git.dyroneteng@xxxxxxxxx> * cl/rerere-train-with-no-sign (2022-07-19) 1 commit (merged to 'next' on 2022-07-20 at fbb9414d09) + contrib/rerere-train: avoid useless gpg sign in training "rerere-train" script (in contrib/) used to honor commit.gpgSign while recreating the throw-away merges. Will merge to 'master'. source: <PH7PR14MB5594A27B9295E95ACA4D6A69CE8F9@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx> * ab/submodule-helper-leakfix (2022-07-28) 18 commits - submodule--helper: fix a configure_added_submodule() leak - submodule--helper: free rest of "displaypath" in "struct update_data" - submodule--helper: free some "displaypath" in "struct update_data" - submodule--helper: fix a memory leak in print_status() - submodule--helper: fix a leak in module_add() - submodule--helper: fix obscure leak in module_add() - submodule--helper: fix "reference" leak - submodule--helper: fix a memory leak in get_default_remote_submodule() - submodule--helper: fix a leak with repo_clear() - submodule--helper: fix "sm_path" and other "module_cb_list" leaks - submodule--helper: fix "errmsg_str" memory leak - submodule--helper: add and use *_release() functions - submodule--helper: don't leak {run,capture}_command() cp.dir argument - submodule--helper: "struct pathspec" memory leak in module_update() - submodule--helper: fix most "struct pathspec" memory leaks - submodule--helper: fix trivial get_default_remote_submodule() leak - submodule--helper: fix a leak in "clone_submodule" - Merge branch 'ab/submodule-helper-prep' into ab/submodule-helper-leakfix (this branch uses ab/submodule-helper-prep.) Plugging leaks in submodule--helper. Getting there. source: <cover-v4-00.17-00000000000-20220728T162442Z-avarab@xxxxxxxxx> * jt/fetch-pack-trace2-filter-spec (2022-07-26) 1 commit (merged to 'next' on 2022-07-28 at 8e6237d6b0) + fetch-pack: write effective filter to trace2 "git fetch" client logs the partial clone filter used in the trace2 output. Will merge to 'master'. source: <20220726162712.1774355-1-jonathantanmy@xxxxxxxxxx> * mb/doc-rerere-autoupdate (2022-07-15) 1 commit - cherry-pick doc: clarify no-rerere-autoupdate still allows rerere Clarifies that the "--no-rerere-autoupdate" option does not disable the "rerere" mechanism (nor does "--rerere-autoupdate" enable it). Needs updating, at least for other commands with the same option. cf. <xmqq35f2ysd9.fsf@gitster.g> source: <20220715092527.1567837-1-mail@xxxxxxxxxxxxxxxx> * rs/mergesort (2022-07-17) 10 commits (merged to 'next' on 2022-07-27 at 42607a44bb) + mergesort: remove llist_mergesort() + packfile: use DEFINE_LIST_SORT + fetch-pack: use DEFINE_LIST_SORT + commit: use DEFINE_LIST_SORT + blame: use DEFINE_LIST_SORT + test-mergesort: use DEFINE_LIST_SORT + test-mergesort: use DEFINE_LIST_SORT_DEBUG + mergesort: add macros for typed sort of linked lists + mergesort: tighten merge loop + mergesort: unify ranks loops Make our mergesort implementation type-safe. Will merge to 'master'. source: <4d7cd286-398e-215c-f2bd-aa7e8207be4f@xxxxxx> * cw/submodule-merge-messages (2022-07-28) 1 commit - submodule merge: update conflict error message Update the message given when "git merge" sees conflicts at a path with a submodule while merging a superproject. source: <20220728211221.2913928-1-calvinwan@xxxxxxxxxx> * mt/checkout-count-fix (2022-07-14) 3 commits (merged to 'next' on 2022-07-22 at 60c73a6b0b) + checkout: fix two bugs on the final count of updated entries + checkout: show bug about failed entries being included in final report + checkout: document bug where delayed checkout counts entries twice (this branch is used by mt/rot13-in-c.) "git checkout" miscounted the paths it updated, which has been corrected. Will merge to 'master'. source: <cover.1657799213.git.matheus.bernardino@xxxxxx> * tb/commit-graph-genv2-upgrade-fix (2022-07-15) 3 commits (merged to 'next' on 2022-07-25 at e3464c2c1d) + commit-graph: fix corrupt upgrade from generation v1 to v2 + commit-graph: introduce `repo_find_commit_pos_in_graph()` + t5318: demonstrate commit-graph generation v2 corruption There was a bug in the codepath to upgrade generation information in commit-graph from v1 to v2 format, which has been corrected. Will merge to 'master'. source: <cover.1657667404.git.me@xxxxxxxxxxxx> * js/safe-directory-plus (2022-07-13) 3 commits - mingw: be more informative when ownership check fails on FAT32 - mingw: handle a file owned by the Administrators group correctly - Allow debugging unsafe directories' ownership Expecting a reroll. cf. <8rqqnqp1-q613-ron6-6q8s-n7sq57o980q9@xxxxxx> source: <pull.1286.git.1657700238.gitgitgadget@xxxxxxxxx> * po/doc-add-renormalize (2022-07-09) 1 commit - doc add: renormalize is not idempotent for CRCRLF Documentation for "git add --renormalize" has been improved. Expecting a reroll. cf. <dfe0c1ab-33f8-f13e-71ce-1829bb0d2d7f@iee.email> source: <d3b8ed97a105ea1d7e656c964b7eee378e11ede6.1657385781.git.gitgitgadget@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> * ac/bitmap-lookup-table (2022-07-20) 6 commits - bitmap-lookup-table: add performance tests for lookup table - p5310-pack-bitmaps.sh: enable `pack.writeReverseIndex` - pack-bitmap: prepare to read lookup table extension - pack-bitmap-write: learn pack.writeBitmapLookupTable and add tests - pack-bitmap-write.c: write lookup table extension - Documentation/technical: describe bitmap lookup table extension The pack bitmap file gained a bitmap-lookup table to speed up locating the necessary bitmap for a given commit. Seems to be flaky-broken under SHA-256. cf. <p3r70610-8n52-s8q0-n641-onp4ps01330n@xxxxxx> source: <pull.1266.v5.git.1658342304.gitgitgadget@xxxxxxxxx> * kk/p4-client-name-encoding-fix (2022-07-21) 2 commits (merged to 'next' on 2022-07-21 at 008518b4e5) + git-p4: refactoring of p4CmdList() (merged to 'next' on 2022-07-11 at 9c18616f76) + git-p4: fix bug with encoding of p4 client name "git p4" did not handle non-ASCII client name well, which has been corrected. Will merge to 'master'. source: <pull.1285.v3.git.git.1658394440.gitgitgadget@xxxxxxxxx> * sa/cat-file-mailmap (2022-07-18) 4 commits (merged to 'next' on 2022-07-27 at 59c4eb32b3) + cat-file: add mailmap support + ident: rename commit_rewrite_person() to apply_mailmap_to_header() + ident: move commit_rewrite_person() to ident.c + revision: improve commit_rewrite_person() "git cat-file" learned an option to use the mailmap when showing commit and tag objects. Will merge to 'master'. source: <20220718195102.66321-1-siddharthasthana31@xxxxxxxxx> * ds/rebase-update-ref (2022-07-19) 13 commits (merged to 'next' on 2022-07-20 at 9f4bf9ef6c) + sequencer: notify user of --update-refs activity + sequencer: ignore HEAD ref under --update-refs + rebase: add rebase.updateRefs config option + sequencer: rewrite update-refs as user edits todo list + rebase: update refs from 'update-ref' commands + rebase: add --update-refs option + sequencer: add update-ref command + sequencer: define array with enum values + rebase-interactive: update 'merge' description + branch: consider refs under 'update-refs' + t2407: test branches currently using apply backend + t2407: test bisect and rebase as black-boxes + Merge branch 'ds/branch-checked-out' into ds/rebase-update-ref "git rebase -i" learns to update branches whose tip appear in the rebased range. Will merge to 'master'. source: <pull.1247.v5.git.1658255624.gitgitgadget@xxxxxxxxx> * pw/xdiff-alloc (2022-07-08) 4 commits (merged to 'next' on 2022-07-25 at 92a39a5ff2) + xdiff: introduce XDL_ALLOC_GROW() + xdiff: introduce XDL_CALLOC_ARRAY() + xdiff: introduce xdl_calloc + xdiff: introduce XDL_ALLOC_ARRAY() Add a level of redirection to array allocation API in xdiff part, to make it easier to share with the libgit2 project. Will merge to 'master'. source: <pull.1272.v2.git.1657297519.gitgitgadget@xxxxxxxxx> * en/merge-restore-to-pristine (2022-07-22) 8 commits (merged to 'next' on 2022-07-27 at daafc50c15) + merge: do not exit restore_state() prematurely + merge: ensure we can actually restore pre-merge state + merge: make restore_state() restore staged state too + merge: fix save_state() to work when there are stat-dirty files + merge: do not abort early if one strategy fails to handle the merge + merge: abort if index does not match HEAD for trivial merges + merge-resolve: abort if index does not match HEAD + merge-ort-wrappers: make printed message match the one from recursive When "git merge" finds that it cannot perform a merge, it should restore the working tree to the state before the command was initiated, but in some corner cases it didn't. Will merge to 'master'. source: <pull.1231.v5.git.1658541198.gitgitgadget@xxxxxxxxx> * zh/ls-files-format (2022-07-23) 1 commit (merged to 'next' on 2022-07-27 at b7301f16ce) + ls-files: introduce "--format" option "git ls-files" learns the "--format" option to tweak its output. Will merge to 'master'. source: <pull.1262.v9.git.1658558685407.gitgitgadget@xxxxxxxxx> * jt/connected-show-missing-from-which-side (2022-06-10) 1 commit - fetch,fetch-pack: clarify connectivity check error We may find an object missing after a "git fetch" stores the objects it obtained from the other side, but it is not necessarily because the remote failed to send necessary objects. Reword the messages in an attempt to help users explore other possibilities when they hit this error. Expecting a reroll. source: <20220610195247.1177549-1-jonathantanmy@xxxxxxxxxx> * tb/show-ref-count (2022-06-06) 2 commits - builtin/show-ref.c: limit output with `--count` - builtin/show-ref.c: rename `found_match` to `matches_nr` "git show-ref" learned to stop after emitting N refs with the new "--count=N" option. Expecting a reroll. cf. <xmqqczfl4ce1.fsf@gitster.g> source: <cover.1654552560.git.me@xxxxxxxxxxxx> * ds/bundle-uri-more (2022-07-25) 2 commits - bundle-uri: add example bundle organization - docs: document bundle URI standard The "bundle URI" topic. Needs review. source: <pull.1248.v3.git.1658757188.gitgitgadget@xxxxxxxxx> * js/bisect-in-c (2022-06-27) 16 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: teach the `bisect--helper` command to show the correct usage strings - bisect--helper: return only correct exit codes in `cmd_*()` - bisect--helper: move the `BISECT_STATE` case to the end - bisect--helper: make `--bisect-state` optional - bisect--helper: align the sub-command order with git-bisect.sh - bisect--helper: using `--bisect-state` without an argument is a bug - bisect--helper: really retire `--bisect-autostart` - bisect--helper: really retire --bisect-next-check - bisect--helper: retire the --no-log option - 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 Final bits of "git bisect.sh" have been rewritten in C. Expecting a (hopefully final) reroll. cf. <20627.86ilolhnnn.gmgdl@xxxxxxxxxxxxxxxxxxx> source: <pull.1132.v4.git.1656354677.gitgitgadget@xxxxxxxxx> -------------------------------------------------- [Discarded] * ar/send-email-confirm-by-default (2022-04-22) 1 commit . send-email: always confirm by default "git send-email" is changed so that by default it asks for confirmation before sending each message out. Discarded. I wanted to like this, and had it in the version of Git I use myself for daily work, but the prompting turned out to be somewhat distracting. source: <20220422083629.1404989-1-hi@xxxxxxxxx> * mt/doc-config (2022-07-14) 3 commits . doc: notes: unify configuration variables definitions . doc: apply: unify configuration variables definitions . doc: grep: unify configuration variables definitions Unify description of configuration variables used by individual commands in the documentation of the commands and the documentation of the "git config". Retracted. cf. <20220723134834.9693-1-matheus.bernardino@xxxxxx> source: <cover.1657819649.git.matheus.bernardino@xxxxxx>
