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. Maintenance releases v2.37.1 and others have been tagged. They are to address CVE-2022-29187, a vulnerability related to CVE-2022-24765 that was fixed earlier. Big thanks to Carlo Arenas and Johannes Schindelin for fixing the issue and helping the releases out. 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'] * ac/bitmap-format-doc (2022-06-16) 3 commits (merged to 'next' on 2022-06-16 at 5591d11601) + bitmap-format.txt: add information for trailing checksum + bitmap-format.txt: fix some formatting issues + bitmap-format.txt: feed the file to asciidoc to generate html Adjust technical/bitmap-format to be formatted by AsciiDoc, and add some missing information to the documentation. source: <pull.1246.v4.git.1655355834.gitgitgadget@xxxxxxxxx> * cr/setup-bug-typo (2022-06-17) 1 commit (merged to 'next' on 2022-06-17 at 8834ffe0ab) + setup: fix function name in a BUG() message Typofix in a BUG() message. source: <pull.1255.git.1654782920256.gitgitgadget@xxxxxxxxx> * ds/branch-checked-out (2022-06-21) 7 commits (merged to 'next' on 2022-06-21 at e42bc4566f) + branch: drop unused worktrees variable + fetch: stop passing around unused worktrees variable (merged to 'next' on 2022-06-17 at c881874257) + branch: fix branch_checked_out() leaks + branch: use branch_checked_out() when deleting refs + fetch: use new branch_checked_out() and add tests + branch: check for bisects and rebases + branch: add branch_checked_out() helper (this branch is used by ds/rebase-update-ref.) Introduce a helper to see if a branch is already being worked on (hence should not be newly checked out in a working tree), which performs much better than the existing find_shared_symref() to replace many uses of the latter. source: <pull.1254.v2.git.1655234853.gitgitgadget@xxxxxxxxx> * ds/vscode-settings (2022-06-27) 1 commit (merged to 'next' on 2022-07-02 at fcbd2e7aca) + vscode: improve tab size and wrapping Will merge to 'master'. source: <pull.1271.git.1656354587496.gitgitgadget@xxxxxxxxx> * jk/optim-promisor-object-enumeration (2022-06-16) 1 commit (merged to 'next' on 2022-06-16 at ce0712a74c) + is_promisor_object(): walk promisor packs in pack-order Collection of what is referenced by objects in promisor packs have been optimized to inspect these objects in the in-pack order. source: <YqrTsbXbEjx0Pabn@xxxxxxxxxxxxxxxxxxxxxxx> * jk/revisions-doc-markup-fix (2022-06-22) 1 commit (merged to 'next' on 2022-07-02 at e25dbe8cfb) + revisions.txt: escape "..." to avoid asciidoc horizontal ellipsis Documentation mark-up fix. source: <YrOmsA04FZae89be@xxxxxxxxxxxxxxxxxxxxxxx> * pb/diff-doc-raw-format (2022-06-13) 3 commits (merged to 'next' on 2022-07-02 at 198480cbc6) + diff-index.txt: update raw output format in examples + diff-format.txt: correct misleading wording + diff-format.txt: dst can be 0* SHA-1 when path is deleted, too Update "git diff/log --raw" format documentation. source: <pull.1259.git.1655123383.gitgitgadget@xxxxxxxxx> * rs/archive-with-internal-gzip (2022-06-15) 6 commits (merged to 'next' on 2022-06-17 at ab5af6acd1) + archive-tar: use internal gzip by default + archive-tar: use OS_CODE 3 (Unix) for internal gzip + archive-tar: add internal gzip implementation + archive-tar: factor out write_block() + archive: rename archiver data field to filter_command + archive: update format documentation Teach "git archive" to (optionally and then by default) avoid spawning an external "gzip" process when creating ".tar.gz" (and ".tgz") archives. source: <9df761c3-355a-ede9-7971-b32687fe9abb@xxxxxx> * rs/combine-diff-with-incompatible-options (2022-06-21) 2 commits (merged to 'next' on 2022-07-02 at 0fe8b80a3e) + combine-diff: abort if --output is given + combine-diff: abort if --ignore-matching-lines is given Certain diff options are currently ignored when combined-diff is shown; mark them as incompatible with the feature. source: <220524.86v8tuvfl1.gmgdl@xxxxxxxxxxxxxxxxxxx> -------------------------------------------------- [New Topics] * 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. Will merge to 'next'? 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. Will merge to 'next'? source: <pull.1282.git.1657385781.gitgitgadget@xxxxxxxxx> * rs/cocci-array-copy (2022-07-10) 1 commit - cocci: avoid normalization rules for memcpy A coccinelle rule (in contrib/) to encourage use of COPY_ARRAY macro has been improved. Will merge to 'next'. source: <ded153d4-4aea-d4da-11cb-ec66d181e4c9@xxxxxx> * sg/multi-pack-index-parse-options-fix (2022-07-10) 1 commit (merged to 'next' on 2022-07-11 at 1e14685680) + multi-pack-index: simplify handling of unknown --options The way "git multi-pack" uses parse-options API has been improved. Will merge to 'master'. source: <20220710151645.GA2038@xxxxxxxxxx> * jk/ref-filter-discard-commit-buffer (2022-07-11) 1 commit - ref-filter: disable save_commit_buffer while traversing source: <Ysw4JtoHW1vWmqhz@xxxxxxxxxxxxxxxxxxxxxxx> -------------------------------------------------- [Stalled] * ll/curl-accept-language (2022-07-11) 1 commit - remote-curl: send Accept-Language header to server Earlier, HTTP transport clients learned to tell the server side what locale they are in by sending Accept-Language HTTP header, but this was done only for some requests but not others. Will merge to 'next'. source: <pull.1251.v4.git.1657519134336.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> * cw/remote-object-info (2022-05-06) 11 commits - SQUASH??? coccicheck - SQUASH??? ensure that coccicheck is happy - SQUASH??? compilation fix - cat-file: add --batch-command remote-object-info command - cat-file: move parse_cmd and DEFAULT_FORMAT up - transport: add object-info fallback to fetch - transport: add client side capability to request object-info - object-info: send attribute packet regardless of object ids - object-store: add function to free object_info contents - fetch-pack: move fetch default settings - fetch-pack: refactor packet writing A client component to talk with the object-info endpoint. Expecting a reroll. source: <20220502170904.2770649-1-calvinwan@xxxxxxxxxx> -------------------------------------------------- [Cooking] * ab/cocci-unused (2022-07-06) 6 commits (merged to 'next' on 2022-07-11 at 7fa60d2a5b) + cocci: generalize "unused" rule to cover more than "strbuf" + cocci: add and apply a rule to find "unused" strbufs + cocci: have "coccicheck{,-pending}" depend on "coccicheck-test" + cocci: add a "coccicheck-test" target and test *.cocci rules + Makefile & .gitignore: ignore & clean "git.res", not "*.res" + Makefile: remove mandatory "spatch" arguments from SPATCH_FLAGS Add Coccinelle rules to detect the pattern of initializing and then finalizing a structure without using it in between at all, which happens after code restructuring and the compilers fail to recognize as an unused varilable. Will merge to 'master'. source: <cover-v4-0.6-00000000000-20220705T134033Z-avarab@xxxxxxxxx> * jk/clone-unborn-confusion (2022-07-11) 4 commits - clone: move unborn head creation to update_head() - clone: use remote branch if it matches default HEAD - clone: propagate empty remote HEAD even with other branches - clone: drop extra newline from warning message "git clone" from a repository with some ref whose HEAD is unborn did not set the HEAD in the resulting repository correctly, which has been corrected. Will merge to 'next'. source: <YsdyLS4UFzj0j/wB@xxxxxxxxxxxxxxxxxxxxxxx> source: <YsvrsOH1jg559yVt@xxxxxxxxxxxxxxxxxxxxxxx> * ac/bitmap-lookup-table (2022-07-06) 6 commits - p5310-pack-bitmaps.sh: remove pack.writeReverseIndex - bitmap-lookup-table: add performance tests for lookup table - 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. Will merge to 'next'? source: <pull.1266.v3.git.1656924376.gitgitgadget@xxxxxxxxx> * bc/nettle-sha256 (2022-07-10) 1 commit (merged to 'next' on 2022-07-11 at cf9595d8ca) + sha256: add support for Nettle Support for libnettle as SHA256 implementation has been added. Will merge to 'master'. source: <20220710132907.1499365-1-sandals@xxxxxxxxxxxxxxxxxxxx> * jc/builtin-mv-move-array (2022-07-09) 1 commit (merged to 'next' on 2022-07-09 at 0d3b3f62e5) + builtin/mv.c: use the MOVE_ARRAY() macro instead of memmove() Apply Coccinelle rule to turn raw memmove() into MOVE_ARRAY() cpp macro, which would improve maintainability and readability. Will merge to 'master'. source: <xmqq4jzpu4xp.fsf_-_@gitster.g> * jd/gpg-interface-trust-level-string (2022-07-10) 1 commit (merged to 'next' on 2022-07-11 at 7b3cca73a8) + gpg-interface: add function for converting trust level to string The code to convert between GPG trust level strings and internal constants we use to represent them have been cleaned up. Will merge to 'master'. source: <pull.1281.v4.git.1657515650587.gitgitgadget@xxxxxxxxx> * kk/p4-client-name-encoding-fix (2022-07-08) 1 commit (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.git.git.1657267260405.gitgitgadget@xxxxxxxxx> * sa/cat-file-mailmap (2022-07-09) 4 commits - 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. source: <20220709154149.165524-1-siddharthasthana31@xxxxxxxxx> * fr/vimdiff-layout-fix (2022-07-08) 1 commit (merged to 'next' on 2022-07-09 at d8461bd236) + vimdiff: make layout engine more robust against user vim settings Recent update to vimdiff layout code has been made more robust against different end-user vim settings. Will merge to 'master'. source: <20220708181024.45839-1-greenfoo@xxxxxx> * ds/git-rebase-doc-markup (2022-06-30) 1 commit (merged to 'next' on 2022-07-08 at 24a0b80b71) + git-rebase.txt: use back-ticks consistently References to commands-to-be-typed-literally in "git rebase" documentation mark-up have been corrected. Will merge to 'master'. source: <pull.1270.v3.git.1656508868146.gitgitgadget@xxxxxxxxx> * ds/rebase-update-ref (2022-06-28) 8 commits - rebase: add rebase.updateRefs config option - 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 "git rebase -i" learns to update branches whose tip appear in the rebased range. Expecting a reroll. cf. <15631ea2-6722-fd24-c8a6-0cee638b0602@xxxxxxxxxx> source: <pull.1247.v3.git.1656422759.gitgitgadget@xxxxxxxxx> * tb/pack-objects-remove-pahole-comment (2022-06-28) 1 commit (merged to 'next' on 2022-07-06 at d7494fbdef) + pack-objects.h: remove outdated pahole results Comment fix. Will merge to 'master'. source: <1379af2e9d271b501ef3942398e7f159a9c77973.1656440978.git.me@xxxxxxxxxxxx> * ab/leakfix (2022-07-01) 11 commits (merged to 'next' on 2022-07-11 at 0b107fffcf) + pull: fix a "struct oid_array" memory leak + cat-file: fix a common "struct object_context" memory leak + gc: fix a memory leak + checkout: avoid "struct unpack_trees_options" leak + merge-file: fix memory leaks on error path + merge-file: refactor for subsequent memory leak fix + cat-file: fix a memory leak in --batch-command mode + revert: free "struct replay_opts" members + submodule.c: free() memory from xgetcwd() + clone: fix memory leak in wanted_peer_refs() + check-ref-format: fix trivial memory leak Plug various memory leaks. Will merge to 'master'. source: <cover-v2-00.11-00000000000-20220701T104017Z-avarab@xxxxxxxxx> * ab/test-tool-leakfix (2022-07-01) 9 commits (merged to 'next' on 2022-07-11 at db7a724694) + test-tool delta: fix a memory leak + test-tool ref-store: fix a memory leak + test-tool bloom: fix memory leaks + test-tool json-writer: fix memory leaks + test-tool regex: call regfree(), fix memory leaks + test-tool urlmatch-normalization: fix a memory leak + test-tool {dump,scrap}-cache-tree: fix memory leaks + test-tool path-utils: fix a memory leak + test-tool test-hash: fix a memory leak Plug various memory leaks in test-tool commands. Will merge to 'master'. source: <cover-v2-0.9-00000000000-20220701T103503Z-avarab@xxxxxxxxx> * en/t6429-test-must-be-empty-fix (2022-06-30) 1 commit (merged to 'next' on 2022-07-06 at 627c51773c) + t6429: fix use of non-existent function A test fix. Will merge to 'master'. source: <pull.1276.git.1656652799863.gitgitgadget@xxxxxxxxx> * gc/submodule-use-super-prefix (2022-06-30) 8 commits (merged to 'next' on 2022-07-11 at 0d9cf172f9) + submodule--helper: remove display path helper + submodule--helper update: use --super-prefix + submodule--helper: remove unused SUPPORT_SUPER_PREFIX flags + submodule--helper: use correct display path helper + submodule--helper: don't recreate recursive prefix + submodule--helper update: use display path helper + submodule--helper tests: add missing "display path" coverage + Merge branch 'ab/submodule-cleanup' into gc/submodule-use-super-prefix (this branch uses ab/submodule-cleanup.) Another step to rewrite more parts of "git submodule" in C. Will merge to 'master'. source: <20220701021157.88858-1-chooglen@xxxxxxxxxx> * hx/lookup-commit-in-graph-fix (2022-06-30) 1 commit (merged to 'next' on 2022-07-08 at cef32db0b6) + commit-graph.c: no lazy fetch in lookup_commit_in_graph() A corner case bug where lazily fetching objects from a promisor remote resulted in infinite recursion has been corrected. Will merge to 'master'. source: <96d4bb71505d87ed501c058bbd89bfc13d08b24a.1656593279.git.hanxin.hx@xxxxxxxxxxxxx> * ll/ls-files-tests-update (2022-07-06) 1 commit (merged to 'next' on 2022-07-06 at 444d1eabd0) + ls-files: update test style Test update. Will merge to 'master'. source: <pull.1269.v6.git.1656863349926.gitgitgadget@xxxxxxxxx> * pw/xdiff-alloc (2022-07-08) 4 commits - 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 'next'? source: <pull.1272.v2.git.1657297519.gitgitgadget@xxxxxxxxx> * sy/mv-out-of-cone (2022-07-01) 8 commits (merged to 'next' on 2022-07-08 at 654970fdb7) + mv: add check_dir_in_index() and solve general dir check issue + mv: use flags mode for update_mode + mv: check if <destination> exists in index to handle overwriting + mv: check if out-of-cone file exists in index with SKIP_WORKTREE bit + mv: decouple if/else-if checks using goto + mv: update sparsity after moving from out-of-cone to in-cone + t1092: mv directory from out-of-cone to in-cone + t7002: add tests for moving out-of-cone file/directory "git mv A B" in a sparsely populated working tree can be asked to move a path between directories that are "in cone" (i.e. expected to be materialized in the working tree) and "out of cone" (i.e. expected to be hidden). The handling of such cases has been improved. Will merge to 'master'. source: <20220630023737.473690-1-shaoxuan.yuan02@xxxxxxxxx> * ab/squelch-empty-fsync-traces (2022-06-30) 1 commit . trace2: don't include "fsync" events in all trace2 logs Omit fsync-related trace2 entries when their values are all zero. Breaks tests in hx/unpack-streaming with an interesting interaction. source: <patch-v2-1.1-a1fc37de947-20220630T084607Z-avarab@xxxxxxxxx> * cl/grep-max-count (2022-06-22) 1 commit (merged to 'next' on 2022-07-08 at 646199ab4c) + grep: add --max-count command line option "git grep -m<max-hits>" is a way to limit the hits shown per file. Will merge to 'master'. source: <pull.1278.v4.git.git.1655927252899.gitgitgadget@xxxxxxxxx> * tk/rev-parse-doc-clarify-at-u (2022-06-23) 1 commit (merged to 'next' on 2022-07-08 at 1075452f32) + rev-parse: documentation adjustment - mention remote tracking with @{u} Doc update. Will merge to 'master'. source: <pull.1265.v2.git.1655960512385.gitgitgadget@xxxxxxxxx> * en/merge-tree (2022-06-22) 17 commits (merged to 'next' on 2022-07-08 at a29b4896ab) + git-merge-tree.txt: add a section on potentional usage mistakes + merge-tree: add a --allow-unrelated-histories flag + merge-tree: allow `ls-files -u` style info to be NUL terminated + merge-ort: optionally produce machine-readable output + merge-ort: store more specific conflict information + merge-ort: make `path_messages` a strmap to a string_list + merge-ort: store messages in a list, not in a single strbuf + merge-tree: provide easy access to `ls-files -u` style info + merge-tree: provide a list of which files have conflicts + merge-ort: remove command-line-centric submodule message from merge-ort + merge-ort: provide a merge_get_conflicted_files() helper function + merge-tree: support including merge messages in output + merge-ort: split out a separate display_update_messages() function + merge-tree: implement real merges + merge-tree: add option parsing and initial shell for real merge function + merge-tree: move logic for existing merge into new function + merge-tree: rename merge_trees() to trivial_merge_trees() A new command is introduced that takes two commits and computes a tree that would be contained in the resulting merge commit, if the histories leading to these two commits were to be merged, and is added as a new mode of "git merge-tree" subcommand. Will merge to 'master'. source: <pull.1122.v7.git.1655511660.gitgitgadget@xxxxxxxxx> * dr/i18n-die-warn-error-usage (2022-06-21) 1 commit (merged to 'next' on 2022-07-08 at 6f639750a1) + i18n: mark message helpers prefix for translation Give _() markings to fatal/warning/usage: labels that are shown in front of these messages. Will merge to 'master'. source: <pull.1279.v2.git.git.1655819877758.gitgitgadget@xxxxxxxxx> * ds/t5510-brokequote (2022-06-21) 1 commit (merged to 'next' on 2022-07-06 at 2776bed385) + t5510: replace 'origin' with URL more carefully Test fix. Will merge to 'master'. source: <484a330e-0902-6e1b-8189-63c72dcea494@xxxxxxxxxx> * en/merge-restore-to-pristine (2022-06-21) 6 commits - 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 racy-dirty files - merge: remove unused variable - t6424: make sure a failed merge preserves local changes 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. Needs review. source: <pull.1231.v2.git.1655621424.gitgitgadget@xxxxxxxxx> * 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> * zh/ls-files-format (2022-07-11) 1 commit - ls-files: introduce "--format" option "git ls-files" learns the "--format" option to tweak its output. Getting closer to finish? cf. <xmqqleszl2p0.fsf@gitster.g> source: <pull.1262.v6.git.1657558435532.gitgitgadget@xxxxxxxxx> * ab/test-quoting-fix (2022-06-30) 3 commits (merged to 'next' on 2022-07-06 at 0aa78fd9db) + config tests: fix harmless but broken "rm -r" cleanup + test-lib.sh: fix prepend_var() quoting issue + tests: add missing double quotes to included library paths Fixes for tests when the source directory has unusual characters in its path, e.g. whitespaces, double-quotes, etc. Will merge to 'master'. source: <cover-v2-0.3-00000000000-20220630T101646Z-avarab@xxxxxxxxx> * en/merge-dual-dir-renames-fix (2022-07-06) 5 commits (merged to 'next' on 2022-07-11 at 5f8dadf87b) + merge-ort: fix issue with dual rename and add/add conflict + merge-ort: shuffle the computation and cleanup of potential collisions + merge-ort: make a separate function for freeing struct collisions + merge-ort: small cleanups of check_for_directory_rename + t6423: add tests of dual directory rename plus add/add conflict Fixes a long-standing corner case bug around directory renames in the merge-ort strategy. Will merge to 'master'. source: <pull.1268.v4.git.1656984823.gitgitgadget@xxxxxxxxx> * zk/push-use-bitmaps (2022-06-17) 1 commit (merged to 'next' on 2022-07-08 at 8aa1f94fad) + send-pack.c: add config push.useBitmaps "git push" sometimes perform poorly when reachability bitmaps are used, even in a repository where other operations are helped by bitmaps. The push.useBitmaps configuration variable is introduced to allow disabling use of reachability bitmaps only for "git push". Will merge to 'master'. source: <pull.1263.v4.git.1655492779228.gitgitgadget@xxxxxxxxx> * jk/remote-show-with-negative-refspecs (2022-06-17) 1 commit (merged to 'next' on 2022-07-08 at d4e49ad22a) + remote: handle negative refspecs in git remote show (this branch is used by jk/t5505-restructure.) "git remote show [-n] frotz" now pays attention to negative pathspecs. Will merge to 'master'. source: <20220617002036.1577-2-jacob.keller@xxxxxxxxx> * js/commit-graph-parsing-without-repo-settings (2022-06-15) 1 commit - commit-graph: refactor to avoid prepare_repo_settings Expecting a reroll. source: <9b56496b0809cc8a25af877ea97042e2cb7f2af6.1655246092.git.steadmon@xxxxxxxxxx> * ro/mktree-allow-missing-fix (2022-06-21) 1 commit (merged to 'next' on 2022-07-08 at 599ed6fb84) + mktree: do not check type of remote objects "git mktree --missing" lazily fetched objects that are missing from the local object store, which was totally unnecessary for the purpose of creating the tree object(s) from its input. Will merge to 'master'. source: <748f39a9-65aa-2110-cf92-7ddf81b5f507@xxxxxxxx> * 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> * ab/submodule-cleanup (2022-06-28) 12 commits (merged to 'next' on 2022-07-08 at 6f3886aa03) + git-sh-setup.sh: remove "say" function, change last users + git-submodule.sh: use "$quiet", not "$GIT_QUIET" + submodule--helper: eliminate internal "--update" option + submodule--helper: understand --checkout, --merge and --rebase synonyms + submodule--helper: report "submodule" as our name in some "-h" output + submodule--helper: rename "absorb-git-dirs" to "absorbgitdirs" + submodule update: remove "-v" option + submodule--helper: have --require-init imply --init + git-submodule.sh: remove unused top-level "--branch" argument + git-submodule.sh: make the "$cached" variable a boolean + git-submodule.sh: remove unused $prefix variable + git-submodule.sh: remove unused sanitize_submodule_env() (this branch is used by gc/submodule-use-super-prefix.) Further preparation to turn git-submodule.sh into a builtin. Will merge to 'master'. source: <cover-v4-00.12-00000000000-20220628T095914Z-avarab@xxxxxxxxx> * jc/resolve-undo (2022-07-11) 2 commits - fsck: do not dereference NULL while checking resolve-undo data (merged to 'next' on 2022-06-15 at c195e5a2d9) + revision: mark blobs needed for resolve-undo as reachable The resolve-undo information in the index was not protected against GC, which has been corrected. Will merge to 'next'. source: <xmqqfskdieqz.fsf@gitster.g> * ab/build-gitweb (2022-06-28) 8 commits (merged to 'next' on 2022-07-11 at 731e354ff0) + gitweb/Makefile: add a "NO_GITWEB" parameter + Makefile: build 'gitweb' in the default target + gitweb/Makefile: include in top-level Makefile + gitweb: remove "test" and "test-installed" targets + gitweb/Makefile: prepare to merge into top-level Makefile + gitweb/Makefile: clear up and de-duplicate the gitweb.{css,js} vars + gitweb/Makefile: add a $(GITWEB_ALL) variable + gitweb/Makefile: define all .PHONY prerequisites inline Teach "make all" to build gitweb as well. Will merge to 'master'. source: <cover-v3-0.8-00000000000-20220628T100936Z-avarab@xxxxxxxxx> * ab/test-without-templates (2022-06-06) 7 commits (merged to 'next' on 2022-07-11 at afab6c1918) + tests: don't assume a .git/info for .git/info/sparse-checkout + tests: don't assume a .git/info for .git/info/exclude + tests: don't assume a .git/info for .git/info/refs + tests: don't assume a .git/info for .git/info/attributes + tests: don't assume a .git/info for .git/info/grafts + tests: don't depend on template-created .git/branches + t0008: don't rely on default ".git/info/exclude" Tweak tests so that they still work when the "git init" template did not create .git/info directory. Will merge to 'master'. source: <cover-v2-0.7-00000000000-20220603T110506Z-avarab@xxxxxxxxx> * hx/unpack-streaming (2022-06-13) 6 commits (merged to 'next' on 2022-07-08 at 4eb375ec2f) + unpack-objects: use stream_loose_object() to unpack large objects + core doc: modernize core.bigFileThreshold documentation + object-file.c: add "stream_loose_object()" to handle large object + object-file.c: factor out deflate part of write_loose_object() + object-file.c: refactor write_loose_object() to several steps + unpack-objects: low memory footprint for get_data() in dry_run mode Allow large objects read from a packstream to be streamed into a loose object file straight, without having to keep it in-core as a whole. Will merge to 'master'. source: <cover.1654914555.git.chiyutianyi@xxxxxxxxx> * 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-06-06) 6 commits - fetch: add 'refs/bundle/' to log.excludeDecoration - bundle-uri: add support for http(s):// and file:// - fetch: add --bundle-uri option - bundle-uri: create basic file-copy logic - remote-curl: add 'get' capability - docs: document bundle URI standard The "bundle URI" topic. Needs review. source: <pull.1248.git.1654545325.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> * gc/bare-repo-discovery (2022-07-07) 5 commits - setup.c: create `discovery.bare` - safe.directory: use git_protected_config() - config: learn `git_protected_config()` - Documentation: define protected configuration - Documentation/git-config.txt: add SCOPES section Introduce a discovery.barerepository configuration variable that allows users to forbid discovery of bare repositories. Will merge to 'next'? source: <pull.1261.v7.git.git.1657234914.gitgitgadget@xxxxxxxxx> * gg/worktree-from-the-above (2022-06-21) 2 commits (merged to 'next' on 2022-07-08 at fa0e71ba39) + dir: minor refactoring / clean-up + dir: traverse into repository In a non-bare repository, the behavior of Git when the core.worktree configuration variable points at a directory that has a repository as its subdirectory, regressed in Git 2.27 days. Will merge to 'master'. source: <20220616234433.225-1-gg.oss@xxxxxxxxxxx> source: <20220616231956.154-1-gg.oss@xxxxxxxxxxx> -------------------------------------------------- [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>
