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. I just tagged Git 2.37-rc0, after merging some topics to the 'master' branch. For some topics, it is a day early (I usually try to have topics cook at least 7 calendar days in 'next'), but since tomorrow is my "offline every other Tuesday" day, I am merging them early, among them is a fix for another (and hopefully the last known) 2.36 regression. I plan to tag -rc1 around the end of the week, at which time we will stop merging any new topic from the 'next' branch down to 'master' until the final release that will happen around the end of the month (https://tinyurl.com/gitCal). Copies of the source code to Git live in many repositories, and the following is a list of the ones I push into or their mirrors. Some repositories have only a subset of branches. With maint, master, next, seen, todo: git://git.kernel.org/pub/scm/git/git.git/ git://repo.or.cz/alt-git.git/ https://kernel.googlesource.com/pub/scm/git/git/ https://github.com/git/git/ https://gitlab.com/git-vcs/git/ With all the integration branches and topics broken out: https://github.com/gitster/git/ Even though the preformatted documentation in HTML and man format are not sources, they are published in these repositories for convenience (replace "htmldocs" with "manpages" for the manual pages): git://git.kernel.org/pub/scm/git/git-htmldocs.git/ https://github.com/gitster/git-htmldocs.git/ Release tarballs are available at: https://www.kernel.org/pub/software/scm/git/ -------------------------------------------------- [Graduated to 'master'] * ab/hooks-regression-fix (2022-06-07) 2 commits (merged to 'next' on 2022-06-08 at c1109feb67) + hook API: fix v2.36.0 regression: hooks should be connected to a TTY + run-command: add an "ungroup" option to run_process_parallel() In Git 2.36 we revamped the way how hooks are invoked. One change that is end-user visible is that the output of a hook is no longer directly connected to the standard output of "git" that spawns the hook, which was noticed post release. This is getting corrected. source: <cover-v6-0.2-00000000000-20220606T170356Z-avarab@xxxxxxxxx> * ab/remote-free-fix (2022-06-07) 2 commits (merged to 'next' on 2022-06-08 at 03c3aeaeee) + remote.c: don't dereference NULL in freeing loop + remote.c: remove braces from one-statement "for"-loops Use-after-free (with another forget-to-free) fix. source: <cover-0.3-00000000000-20220607T154520Z-avarab@xxxxxxxxx> * ds/credentials-in-url (2022-06-06) 1 commit (merged to 'next' on 2022-06-08 at 3db83a2012) + remote: create fetch.credentialsInUrl config The "fetch.credentialsInUrl" configuration variable controls what happens when a URL with embedded login credential is used. source: <pull.1237.v5.git.1654526176695.gitgitgadget@xxxxxxxxx> * gc/document-config-worktree-scope (2022-06-07) 1 commit (merged to 'next' on 2022-06-08 at 85f62a864a) + config: document and test the 'worktree' scope Doc update. source: <pull.1274.git.git.1654637044966.gitgitgadget@xxxxxxxxx> * js/wait-or-whine-can-fail (2022-06-07) 1 commit (merged to 'next' on 2022-06-08 at 54fe70c95d) + run-command: don't spam trace2_child_exit() We used to log an error return from wait_or_whine() as process termination of the waited child, which was incorrect. source: <50d872a057a558fa5519856b95abd048ddb514dc.1654625626.git.steadmon@xxxxxxxxxx> * jt/unparse-commit-upon-graft-change (2022-06-06) 1 commit (merged to 'next' on 2022-06-08 at 3d8de84325) + commit,shallow: unparse commits if grafts changed Updating the graft information invalidates the list of parents of in-core commit objects that used to be in the graft file. source: <20220606175437.1740447-1-jonathantanmy@xxxxxxxxxx> * pb/range-diff-with-submodule (2022-06-06) 1 commit (merged to 'next' on 2022-06-07 at e5e31590c4) + range-diff: show submodule changes irrespective of diff.submodule "git -c diff.submodule=log range-diff" did not show anything for submodules that changed in the ranges being compared, and "git -c diff.submodule=diff range-diff" did not work correctly. Fix this by including the "--submodule=short" output unconditionally to be compared. source: <pull.1244.v2.git.1654549153769.gitgitgadget@xxxxxxxxx> * sn/fsmonitor-missing-clock (2022-06-07) 1 commit (merged to 'next' on 2022-06-08 at 812b99338c) + fsmonitor: query watchman with right valid json Sample watchman interface hook sometimes failed to produce correctly formatted JSON message, which has been corrected. source: <20220607111419.15753-1-sluongng@xxxxxxxxx> * tb/show-ref-optim (2022-06-06) 1 commit (merged to 'next' on 2022-06-08 at 683a3cc261) + builtin/show-ref.c: avoid over-iterating with --heads, --tags "git show-ref --heads" (and "--tags") still iterated over all the refs only to discard refs outside the specified area, which has been corrected. source: <3fa6932641f18d78156bbf60b1571383f2cb5046.1654293264.git.me@xxxxxxxxxxxx> * tl/ls-tree-oid-only (2022-06-03) 1 commit (merged to 'next' on 2022-06-07 at e1c1e0b25a) + ls-tree: test for the regression in 9c4d58ff2c3 Add tests for a regression fixed earlier. source: <patch-v2-1.1-f2beb02dd29-20220603T102148Z-avarab@xxxxxxxxx> * zh/read-cache-copy-name-entry-fix (2022-06-06) 1 commit (merged to 'next' on 2022-06-08 at 760f43dd19) + read-cache.c: reduce unnecessary cache entry name copying Remove redundant copying (with index v3 and older) or possible over-reading beyond end of mmapped memory (with index v4) has been corrected. source: <pull.1249.git.1654436248249.gitgitgadget@xxxxxxxxx> -------------------------------------------------- [New Topics] * jc/apply-icase-tests (2022-06-13) 1 commit - t4141: test "git apply" with core.ignorecase source: <xmqqo7yw77qo.fsf@gitster.g> * ll/curl-accept-language (2022-06-13) 2 commits - PREP??? give initializer to rpc_state - remote-curl: send Accept-Language header to server source: <pull.1251.v3.git.1655054421697.gitgitgadget@xxxxxxxxx> * pb/diff-doc-raw-format (2022-06-13) 3 commits - 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 source: <pull.1259.git.1655123383.gitgitgadget@xxxxxxxxx> * rs/archive-with-internal-gzip (2022-06-13) 5 commits - 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 source: <217a2f4d-4fc2-aaed-f5c2-1b7e134b046d@xxxxxx> * tl/pack-bitmap-trace (2022-06-13) 5 commits - bitmap: add trace2 outputs during open "bitmap" file - pack-bitmap.c: using error() instead of silently returning -1 - pack-bitmap.c: make warnings support i18N when opening bitmap - pack-bitmap.c: rename "idx_name" to "bitmap_name" - pack-bitmap.c: continue looping when first MIDX bitmap is found source: <cover.1655018322.git.dyroneteng@xxxxxxxxx> -------------------------------------------------- [Stalled] * en/merge-tree (2022-02-23) 13 commits - 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-tree: provide easy access to `ls-files -u` style info - merge-tree: provide a list of which files have conflicts - 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() - Merge branch 'en/remerge-diff' into en/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. On hold. cf. <CABPp-BGZ7OAYRR5YKRsxJSo-C=ho+qcNAkqwkim8CkhCfCeHsA@xxxxxxxxxxxxxx> source: <pull.1122.v6.git.1645602413.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] * ds/branch-checked-out (2022-06-13) 5 commits - 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 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. Will merge to 'next'? source: <pull.1254.git.1654718942.gitgitgadget@xxxxxxxxx> * fs/ssh-default-key-command-doc (2022-06-08) 1 commit (merged to 'next' on 2022-06-10 at b5cc5b6619) + gpg docs: explain better use of ssh.defaultKeyCommand Doc update. Will merge to 'master'. source: <20220608152437.126276-1-fs@xxxxxxxxxxxx> * js/ci-github-workflow-markup (2022-06-13) 3 commits - ci(github): also mark up compile errors - ci(github): use grouping also in the `win-build` job - ci(github): bring back the 'print test failures' step Recent CI update hides certain failures in test jobs, which has been corrected. Will merge to 'next'. source: <pull.1253.v2.git.1655125988.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> * gc/submodule-update (2022-06-10) 8 commits - submodule update: remove never-used expansion - submodule update: stop parsing options in .sh - submodule update: remove -v, pass --quiet - submodule--helper update: use one param per type - submodule update: pass --require-init and --init - submodule update: pass options with stuck forms - submodule update: pass options containing "[no-]" - submodule update: remove intermediate parsing More work on "git submodule update". Needs review. source: <pull.1275.git.git.1654820781.gitgitgadget@xxxxxxxxx> * jc/resolve-undo (2022-06-09) 1 commit - 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> * jp/prompt-clear-before-upstream-mark (2022-06-10) 2 commits - git-prompt: fix expansion of branch colour codes (merged to 'next' on 2022-06-08 at 201a84ad63) + git-prompt: make colourization consistent Bash command line prompt (in contrib/) update. Will merge to 'next'. source: <20220609204447.32841-1-joak-pet@xxxxxxxxx> source: <20220606175022.8410-1-joak-pet@xxxxxxxxx> * ab/build-gitweb (2022-06-02) 7 commits - 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. Needs review. source: <cover-v2-0.7-00000000000-20220531T173805Z-avarab@xxxxxxxxx> * ab/test-without-templates (2022-06-06) 7 commits - 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 'next'? source: <cover-v2-0.7-00000000000-20220603T110506Z-avarab@xxxxxxxxx> * ac/bitmap-format-doc (2022-06-10) 3 commits - 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. Will merge to 'next'? source: <pull.1246.v3.git.1654858481.gitgitgadget@xxxxxxxxx> * hx/unpack-streaming (2022-06-13) 6 commits - 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 'next'? source: <cover.1654914555.git.chiyutianyi@xxxxxxxxx> * po/rebase-preserve-merges (2022-06-06) 4 commits (merged to 'next' on 2022-06-10 at 471f67aebc) + rebase: translate a die(preserve-merges) message + rebase: note `preserve` merges may be a pull config option + rebase: help users when dying with `preserve-merges` + rebase.c: state preserve-merges has been removed Various error messages that talk about the removal of "--preserve-merges" in "rebase" have been strengthened, and "rebase --abort" learned to get out of a state that was left by an earlier use of the option. Will merge to 'master'. source: <pull.1242.v2.git.1654341469.gitgitgadget@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> * jc/cocci-cleanup (2022-06-07) 1 commit - cocci: retire is_null_sha1() rule Remove a coccinelle rule that is no longer relevant. Will merge to 'next'. source: <xmqq7d5suoqt.fsf@gitster.g> * 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> * jc/revert-show-parent-info (2022-05-31) 2 commits (merged to 'next' on 2022-06-07 at e405211ff4) + revert: --reference should apply only to 'revert', not 'cherry-pick' (merged to 'next' on 2022-05-30 at b5da52dc14) + revert: optionally refer to commit in the "reference" format "git revert" learns "--reference" option to use more human-readable reference to the commit it reverts in the message template it prepares for the user. Will merge to 'master'. source: <xmqq8rqn7buk.fsf_-_@gitster.g> * js/bisect-in-c (2022-05-21) 15 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: teach the `bisect--helper` command to show the correct usage strings - bisect: move even the command-line parsing to `bisect--helper` - 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 Final bits of "git bisect.sh" have been rewritten in C. The command line parsing is reported to be still broken. cf. <220521.86zgjazuy4.gmgdl@xxxxxxxxxxxxxxxxxxx> source: <pull.1132.v3.git.1653144546.gitgitgadget@xxxxxxxxx> * cb/path-owner-check-with-sudo-plus (2022-05-12) 1 commit - git-compat-util: allow root to access both SUDO_UID and root owned "sudo git foo" used to consider a repository owned by the original user a safe one to access; it now also considers a repository owned by root a safe one, too (after all, if an attacker can craft a malicious repository owned by root, the box is 0wned already). Will merge to 'next'? cf. <20220519152344.ktrifm3pc42bjruh@Carlos-MacBook-Pro-2.local> source: <20220513010020.55361-5-carenas@xxxxxxxxx> * gc/bare-repo-discovery (2022-06-07) 5 commits - setup.c: create `discovery.bare` - safe.directory: use git_protected_config() - config: read protected config with `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. Expecting a reroll. source: <29053d029f8ec61095a2ad557be38b1d485a158f.1654635432.git.gitgitgadget@xxxxxxxxx> * gg/worktree-from-the-above (2022-05-20) 3 commits - dir: minor refactoring / clean-up - dir: cache git_dir's realpath - dir: traverse into repository With a non-bare repository, with core.worktree pointing at a directory that has the repository as its subdirectory, regressed in Git 2.27 days. Needs review. source: <20220520192840.8942-1-ggossdev@xxxxxxxxx> * 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. Will discard. 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. Thoughts? source: <20220422083629.1404989-1-hi@xxxxxxxxx>
