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). Git 2.42-rc1 has been tagged. From here on, the 'master' front is expected to merge only fixes for new regressions that happened in this cycle, while other topics will wait in 'next' or on the mailing list for their turn after the release is done. 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'] * bc/ident-dot-is-no-longer-crud-letter (2023-08-02) 1 commit (merged to 'next' on 2023-08-03 at e786442a9b) + ident: don't consider '.' a crud Exclude "." from the set of characters to be removed from the beginning and the end of the human-readable name. source: <xmqqsf918k4j.fsf@gitster.g> * bc/ignore-clangd-cache (2023-08-04) 1 commit (merged to 'next' on 2023-08-04 at 5cf8d41911) + gitignore: ignore clangd .cache directory .gitignore update. source: <20230804171328.1737188-1-sandals@xxxxxxxxxxxxxxxxxxxx> * ew/hash-with-openssl-evp (2023-08-01) 2 commits (merged to 'next' on 2023-08-02 at 996db74865) + avoid SHA-1 functions deprecated in OpenSSL 3+ + sha256: avoid functions deprecated in OpenSSL 3+ Adjust to OpenSSL 3+, which deprecates its SHA-1 functions based on its traditional API, by using its EVP API instead. source: <20230801025454.1137802-1-e@xxxxxxxxx> * ma/locate-in-path-for-windows (2023-08-04) 3 commits (merged to 'next' on 2023-08-06 at 02bc13f4a3) + docs: update when `git bisect visualize` uses `gitk` + compat/mingw: implement a native locate_in_PATH() + run-command: conditionally define locate_in_PATH() "git bisect visualize" stopped running "gitk" on Git for Windows when the command was reimplemented in C around Git 2.34 timeframe. This has been corrected. source: <pull.1560.v2.git.1691122124.gitgitgadget@xxxxxxxxx> * pw/rebase-skip-commit-message-fix (2023-08-03) 1 commit (merged to 'next' on 2023-08-06 at 1e44443e65) + rebase --skip: fix commit message clean up when skipping squash "git rebase -i" with a series of squash/fixup, when one of the steps stopped in conflicts and ended up getting skipped, did not handle the accumulated commit log messages, which has been corrected. source: <pull.1558.git.git.1691068176051.gitgitgadget@xxxxxxxxx> -------------------------------------------------- [New Topics] * ds/maintenance-on-windows-fix (2023-08-09) 2 commits (merged to 'next' on 2023-08-09 at 3d7abef9be) + git maintenance: avoid console window in scheduled tasks on Windows + win32: add a helper to run `git.exe` without a foreground window Windows updates. Will merge to 'master'. source: <pull.1570.git.1691600087.gitgitgadget@xxxxxxxxx> * jc/send-email-pre-process-fix (2023-08-09) 1 commit (merged to 'next' on 2023-08-09 at ba1b999ec2) + t9001: remove excessive GIT_SEND_EMAIL_NOTTY=1 Test fix. Will merge to 'master'. source: <20230809171531.2564754-1-oswald.buddenhagen@xxxxxx> * ob/sequencer-rearrange-cleanup (2023-08-09) 1 commit (merged to 'next' on 2023-08-09 at df4360945c) + sequencer: simplify allocation of result array in todo_list_rearrange_squash() Code clean-up. Will cook in 'next'. source: <20230809171532.2564880-1-oswald.buddenhagen@xxxxxx> * st/mv-lstat-fix (2023-08-09) 1 commit (merged to 'next' on 2023-08-09 at 4b5708df7c) + mv: handle lstat() failure correctly Correct use of lstat() that assumed a failing call would not clobber the statbuf. Will merge to 'master'. source: <pull.1561.v2.git.1691567261701.gitgitgadget@xxxxxxxxx> * tb/repack-geometry-cleanup (2023-08-09) 1 commit - repack: move `pack_geometry` struct to the stack (this branch uses jk/repack-leakfix.) Code clean-up. Will merge to 'next'. source: <cover.1691613149.git.me@xxxxxxxxxxxx> * ws/git-push-doc-grammofix (2023-08-09) 1 commit - git-push.txt: fix grammar Doc update. Will merge to 'next'. source: <20230810012105.1423462-1-wesleys@xxxxxxxxxxxxxxx> * ws/svn-with-new-readline (2023-08-09) 1 commit - git-svn: avoid creating more than one than one Term::ReadLine object (this branch uses jk/send-email-with-new-readline.) Adjust to newer Term::ReadLine to prevent it from breaking the interactive prompt code in git-svn. Will merge to 'next' and then to 'master'. source: <20230810011831.1423208-1-wesleys@xxxxxxxxxxxxxxx> * ak/pretty-decorate-more (2023-08-10) 7 commits - pretty: add pointer and tag options to %(decorate) - pretty: add %(decorate[:<options>]) format - decorate: color each token separately - decorate: avoid some unnecessary color overhead - decorate: refactor format_decorations() - pretty-formats: enclose options in angle brackets - pretty-formats: define "literal formatting code" Teach "git log --format" a customizable %(decorate) placeholder. Needs review. source: <20230715160730.4046-1-andy.koppe@xxxxxxxxx> * ds/upload-pack-error-sequence-fix (2023-08-10) 1 commit - upload-pack: fix race condition in error messages Error message generation fix. Will merge to 'next'. source: <pull.1572.git.1691678450757.gitgitgadget@xxxxxxxxx> * mp/rebase-label-length-limit (2023-08-10) 2 commits - rebase: allow overriding the maximal length of the generated labels - sequencer: truncate labels to accommodate loose refs Chomp overly long label names used in the sequencer machinery. Will merge to 'next'. source: <pull.1562.git.git.1691685300.gitgitgadget@xxxxxxxxx> * pw/diff-no-index-from-named-pipes (2023-08-10) 1 commit - t4053: avoid race when killing background processes Test updates. Will merge to 'next'? source: <pull.1571.git.1691677993195.gitgitgadget@xxxxxxxxx> * tb/commit-graph-verify-fix (2023-08-10) 4 commits - commit-graph: invert negated conditional - t/t5318-commit-graph.sh: test generation zero transitions during fsck - commit-graph: verify swapped zero/non-zero generation cases - commit-graph: introduce `commit_graph_generation_from_graph()` Update commit-graph verification code that detects mixture of zero and non-zero generation numbers. Will merge to 'next'. source: <cover.1691699851.git.me@xxxxxxxxxxxx> -------------------------------------------------- [Stalled] * sl/sparse-check-attr (2023-07-18) 3 commits - check-attr: integrate with sparse-index - attr.c: read attributes in a sparse directory - t1092: add tests for 'git check-attr' Teach "git check-attr" work better with sparse-index. Expecting a reroll. cf. <c3ebe3b4-88b9-8ca2-2ee3-39a3e0d82201@xxxxxxxxxx> cf. <5e478d8b-9ef4-864b-41e4-e0a79877d278@xxxxxxxxxx> source: <20230718232916.31660-1-cheskaqiqi@xxxxxxxxx> * cc/git-replay (2023-06-03) 15 commits - replay: stop assuming replayed branches do not diverge - replay: add --contained to rebase contained branches - replay: add --advance or 'cherry-pick' mode - replay: disallow revision specific options and pathspecs - 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: don't simplify history - 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 No reviews? source: <20230602102533.876905-1-christian.couder@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> * ab/tag-object-type-errors (2023-05-10) 4 commits - tag: don't emit potentially incorrect "object is a X, not a Y" - tag: don't misreport type of tagged objects in errors - object tests: add test for unexpected objects in tags - Merge branch 'jk/parse-object-type-mismatch' into ab/tag-object-type-errors Hardening checks around mismatched object types when one of those objects is a tag. Will discard. Stalled for too long. source: <cover-v2-0.3-00000000000-20221230T011725Z-avarab@xxxxxxxxx> -------------------------------------------------- [Cooking] * la/trailer-cleanups (2023-08-06) 5 commits - trailer: rename *_DEFAULT enums to *_UNSPECIFIED - trailer: teach find_patch_start about --no-divider - trailer: split process_command_line_args into separate functions - trailer: split process_input_file into separate pieces - trailer: separate public from internal portion of trailer_iterator Code clean-up. Needs review. source: <pull.1563.git.1691211879.gitgitgadget@xxxxxxxxx> * la/trailer-test-and-doc-updates (2023-08-10) 14 commits - SQUASH??? - trailer doc: <token> is a <key> or <keyAlias>, not both - trailer doc: separator within key suppresses default separator - trailer doc: emphasize the effect of configuration variables - trailer --unfold help: prefer "reformat" over "join" - trailer --parse docs: add explanation for its usefulness - trailer --only-input: prefer "configuration variables" over "rules" - trailer --parse help: expose aliased options - trailer --no-divider help: describe usual "---" meaning - trailer: trailer location is a place, not an action - trailer doc: narrow down scope of --where and related flags - trailer: add tests to check defaulting behavior with --no-* flags - trailer test description: this tests --where=after, not --where=before - trailer tests: make test cases self-contained Test coverage improvement for trailers. Needs review. source: <pull.1564.v2.git.1691702283.gitgitgadget@xxxxxxxxx> * jk/repack-leakfix (2023-08-08) 1 commit (merged to 'next' on 2023-08-09 at 8692d7b2e0) + repack: free geometry struct (this branch is used by tb/repack-geometry-cleanup.) Leakfix. Will merge to 'master'. source: <20230808185023.GA3498623@xxxxxxxxxxxxxxxxxxxxxxx> * jk/send-email-with-new-readline (2023-08-08) 2 commits (merged to 'next' on 2023-08-09 at d42e4ca9f8) + send-email: avoid creating more than one Term::ReadLine object + send-email: drop FakeTerm hack (this branch is used by ws/svn-with-new-readline.) Adjust to newer Term::ReadLine to prevent it from breaking the interactive prompt code in send-email. Will merge to 'master'. source: <20230808180935.GA2096901@xxxxxxxxxxxxxxxxxxxxxxx> * js/allow-t4000-to-be-indented-with-spaces (2023-08-08) 1 commit (merged to 'next' on 2023-08-09 at 9c0d6659ec) + t0040: declare non-tab indentation to be okay in this script File attribute update. Will merge to 'master'. source: <pull.1568.git.1691491054706.gitgitgadget@xxxxxxxxx> * ob/rebase-conflict-advice-i18n-fix (2023-08-07) 1 commit (merged to 'next' on 2023-08-09 at 0e02113510) + advice: handle "rebase" in error_resolve_conflict() i18n coverage improvement and avoidance of sentence lego. Will merge to 'master'. source: <20230807170935.2336715-1-oswald.buddenhagen@xxxxxx> * rs/parse-opt-forbid-set-int-0-without-noneg (2023-08-08) 1 commit (merged to 'next' on 2023-08-09 at fab1193dbc) + parse-options: disallow negating OPTION_SET_INT 0 Developer support to detect meaningless combination of options. Will merge to 'master'. source: <c4cd1591-3a83-920a-6a80-19ffbfe3089d@xxxxxx> * ds/maintenance-schedule-fuzz (2023-08-10) 8 commits - maintenance: update schedule before config - maintenance: fix systemd schedule overlaps - maintenance: use random minute in systemd scheduler - maintenance: swap method locations - maintenance: use random minute in cron scheduler - maintenance: use random minute in Windows scheduler - maintenance: use random minute in launchctl scheduler - maintenance: add get_random_minute() Allow "git maintenance" schedule to be randomly distributed. Looking good. source: <pull.1567.v2.git.1691699987.gitgitgadget@xxxxxxxxx> * ob/send-email-interactive-failure (2023-08-09) 1 commit . send-email: prompt-dependent exit codes "git send-email" exits with non-zero status when end-user interaction causes any prepared message not to be sent. Expecting a reroll. Without an opt-in fix, this will be a backward-incompatible change that needs mention in the release notes. source: <20230809171531.2564739-1-oswald.buddenhagen@xxxxxx> * ob/sequencer-empty-hint-fix (2023-08-09) 1 commit . sequencer: rectify empty hint in call of require_clean_work_tree() Update the use of API for consistency between two calls to require_clean_work_tree() from the sequencer code. source: <20230809171531.2564829-1-oswald.buddenhagen@xxxxxx> * rj/branch-in-use-error-message (2023-08-08) 2 commits (merged to 'next' on 2023-08-09 at 5510985b1c) + branch: error message checking out a branch in use + branch: error message deleting a branch in use A message written in olden time prevented a branch from getting checked out saying it is already checked out elsewhere, but these days, we treat a branch that is being bisected or rebased just like a branch that is checked out and protect it. Rephrase the message to say that the branch is in use. Will cook in 'next'. source: <7710c002-0832-d8f6-59b8-30119bd5efe6@xxxxxxxxx> * mh/credential-libsecret-attrs (2023-06-16) 1 commit (merged to 'next' on 2023-08-08 at dc73a2c55a) + credential/libsecret: store new attributes The way authentication related data other than passwords (e.g. oath token and password expiration data) are stored in libsecret keyrings has been rethought. Will cook in 'next'. Needs review. source: <pull.1469.v5.git.git.1686945306242.gitgitgadget@xxxxxxxxx> * jc/rerere-cleanup (2023-08-03) 5 commits - rerere: plug small strbuf leak - 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 (this branch uses jc/unresolve-removal.) Code clean-up. Not ready to be reviewed yet. source: <20230731224409.4181277-1-gitster@xxxxxxxxx> * pw/rebase-i-after-failure (2023-08-01) 7 commits - rebase -i: fix adding failed command to the todo list - rebase --continue: refuse to commit after failed command - rebase: fix rewritten list for failed pick - sequencer: factor out part of pick_commits() - sequencer: use rebase_path_message() - rebase -i: remove patch file after conflict resolution - rebase -i: move unlink() calls Various fixes to the behaviour of "rebase -i" when the command got interrupted by conflicting changes. Expecting a reroll. The latter half of the series should be reviewed by those who have more stake in the sequencer code than myself. cf. <619e458b-218b-a790-dfb4-9200e201b513@xxxxxxxxx> source: <pull.1492.v3.git.1690903412.gitgitgadget@xxxxxxxxx> * jc/unresolve-removal (2023-07-31) 7 commits - checkout: allow "checkout -m path" to unmerge removed paths - checkout/restore: add basic tests for --merge - checkout/restore: refuse unmerging paths unless checking out of the index - update-index: remove stale fallback code for "--unresolve" - update-index: use unmerge_index_entry() to support removal - resolve-undo: allow resurrecting conflicted state that resolved to deletion - update-index: do not read HEAD and MERGE_HEAD unconditionally (this branch is used by jc/rerere-cleanup.) "checkout --merge -- path" and "update-index --unresolve path" did not resurrect conflicted state that was resolved to remove path, but now they do. Needs review. source: <20230731224409.4181277-1-gitster@xxxxxxxxx> * rj/status-bisect-while-rebase (2023-08-01) 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: <48745298-f12b-8efb-4e48-90d2c22a8349@xxxxxxxxx> * rs/parse-options-negation-help (2023-08-06) 8 commits - parse-options: simplify usage_padding() - parse-options: no --[no-]no-... - parse-options: factor out usage_indent() and usage_padding() - parse-options: show negatability of options in short help - t1502: test option negation - t1502: move optionspec help output to a file - t1502, docs: disallow --no-help - subtree: disallow --no-{help,quiet,debug,branch,message} "git cmd -h" learned to signal which options can be negated by listing such options like "--[no-]opt". Comments? source: <e4d46d97-1cd4-7fea-afd1-7de5023b1b09@xxxxxx> * mh/credential-erase-improvements-more (2023-07-26) 2 commits (merged to 'next' on 2023-08-08 at fd1ba4accf) + credential/wincred: erase matching creds only + credential/libsecret: erase matching creds only Update two credential helpers to correctly match which credential to erase; they dropped not the ones with stale password. Will cook in 'next'. Needs review. source: <pull.1527.v2.git.git.1690387585634.gitgitgadget@xxxxxxxxx> source: <pull.1529.git.git.1687596777147.gitgitgadget@xxxxxxxxx> * cc/repack-sift-filtered-objects-to-separate-pack (2023-08-09) 9 commits - SQUASH??? - gc: add `gc.repackFilterTo` config option - repack: implement `--filter-to` for storing filtered out objects - gc: add `gc.repackFilter` config option - repack: add `--filter=<filter-spec>` option - repack: refactor finding pack prefix - repack: refactor finishing pack-objects command - t/helper: add 'find-pack' test-tool - pack-objects: allow `--filter` without `--stdout` "git repack" machinery learns to pay attention to the "--filter=" option. cf. https://github.com/git/git/actions/runs/5812873987 source: <20230808082608.582319-1-christian.couder@xxxxxxxxx> * js/doc-unit-tests (2023-08-07) 1 commit - unit tests: add a project plan document Process to add some form of low-level unit tests has started. Comments? source: <c7dca1a805a16fd4fd68e86efeec97510e3ac4b8.1691449216.git.steadmon@xxxxxxxxxx> * jt/path-filter-fix (2023-08-08) 8 commits (merged to 'next' on 2023-08-09 at 59952b9ec9) + commit-graph: fix small leak with invalid changedPathsVersion (merged to 'next' on 2023-08-03 at d99958c287) + 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 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. Will cook in 'next'. cf. <ZMqp6K2iXixWH/zT@nand.local> source: <cover.1690912539.git.jonathantanmy@xxxxxxxxxx> source: <20230808192240.GA4091261@xxxxxxxxxxxxxxxxxxxxxxx> * ob/test-lib-rebase-fake-editor-updates (2023-08-10) 3 commits - t/lib-rebase: improve documentation of set_fake_editor() - t/lib-rebase: set_fake_editor(): handle FAKE_LINES more consistently - t/lib-rebase: set_fake_editor(): fix recognition of reset's short command Test updates. Will merge to 'next'. source: <20230807170935.2336663-1-oswald.buddenhagen@xxxxxx> source: <20230809171531.2564785-1-oswald.buddenhagen@xxxxxx>
