diff options
| -rwxr-xr-x | Count | 5 | ||||
| -rw-r--r-- | MaintNotes | 6 | ||||
| -rwxr-xr-x | round | 4 | ||||
| -rw-r--r-- | whats-cooking.txt | 776 |
4 files changed, 430 insertions, 361 deletions
@@ -2,9 +2,10 @@ : ${asof=${1-now}} -lasttag=$( +: ${lasttag=$( git tag --list 'v*.0' --sort=version:tag | tail -n 1 -) && + )} + for r in "$lasttag..master@{$asof}" \ "master@{$asof}..next@{$asof}" \ "master@{$asof}..seen@{$asof}" diff --git a/MaintNotes b/MaintNotes index 774ce56c20..00ffa91b41 100644 --- a/MaintNotes +++ b/MaintNotes @@ -178,7 +178,7 @@ named with three dotted decimal digits (e.g., "1.8.5"), but we have switched the versioning scheme and "feature releases" are named with three-dotted decimal digits that ends with ".0" (e.g., "1.9.0"). -The last such release was 2.44 done on Feb 22nd, 2024. We aim to keep +The last such release was 2.45 done on Apr 29th, 2024. We aim to keep that the tip of the "master" branch is always more stable than any of the released versions. @@ -278,9 +278,9 @@ and enhancements in contrib/ area to the primary contributors of them. Although the following are included in git.git repository, they have their own authoritative repository and maintainers: - - git-gui/ comes from git-gui project, maintained by Pratyush Yadav: + - git-gui/ comes from git-gui project, maintained by Johannes Sixt: - https://github.com/prati0100/git-gui.git + https://github.com/j6t/git-gui - gitk-git/ comes from Paul Mackerras's gitk project: @@ -1,8 +1,8 @@ #!/bin/sh # Give names of targets to use on the command line -# coccicheck is not enabled by default -default="sparse hdr-check sha256 leaks address,undefined test check-docs doc" +# coccicheck and address,undefined are not enabled by default +default="sparse hdr-check sha256 leaks test check-docs doc" skip=" " more=" " diff --git a/whats-cooking.txt b/whats-cooking.txt index fd6cdd703e..090a350bda 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,10 +1,10 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (Apr 2024, #08; Mon, 22) -X-master-at: 00e10ef10e161a913893b8cb33aa080d4ca5baa6 -X-next-at: 0c9c63564e25443fb8d0688fe3c87722ba128238 +Subject: What's cooking in git.git (May 2024, #06; Tue, 14) +X-master-at: 83f1add914c6b4682de1e944ec0d1ac043d53d78 +X-next-at: 74e4eb009334be9d0c81507039d39db2634c3a6b Bcc: lwn@lwn.net, gitster@pobox.com -What's cooking in git.git (Apr 2024, #08; Mon, 22) +What's cooking in git.git (May 2024, #06; Tue, 14) -------------------------------------------------- Here are the topics that have been cooking in my tree. Commits @@ -17,6 +17,9 @@ 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.45.1 and friends have been released, and the integration +branches for developers have all been updated to include them. + 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. @@ -46,329 +49,480 @@ Release tarballs are available at: https://www.kernel.org/pub/software/scm/git/ -------------------------------------------------- -[New Topics] +[Graduated to 'master'] -* aj/stash-staged-fix (2024-04-22) 1 commit - - stash: fix "--staged" with binary files +* fa/p4-error (2024-05-08) 1 commit + (merged to 'next' on 2024-05-11 at 58fd3fbf2f) + + git-p4: show Perforce error to the user - "git stash -S" did not handle binary files correctly, which has - been corrected. + P4 update. + source: <pull.1668.v3.git.git.1715206266214.gitgitgadget@gmail.com> - Will merge to 'next'. - source: <pull.1722.git.1713781694490.gitgitgadget@gmail.com> +* jc/git-gui-maintainer-update (2024-05-11) 1 commit + (merged to 'next' on 2024-05-11 at 78c648537b) + + SubmittingPatches: welcome the new maintainer of git-gui part -* rj/add-i-leak-fix (2024-04-22) 4 commits - - add: plug a leak on interactive_add - - add-patch: plug a leak handling the '/' command - - add-interactive: plug a leak in get_untracked_files - - apply: plug a leak in apply_data + Will merge to 'master'. - Leakfix. - Will merge to 'next'. - source: <69f86760-96ff-4c62-9649-4627652b7c19@gmail.com> +* jc/no-default-attr-tree-in-bare (2024-05-03) 1 commit + (merged to 'next' on 2024-05-08 at a34819b16d) + + stop using HEAD for attributes in bare repository by default + (this branch is used by ps/undecided-is-not-necessarily-sha1.) + Git 2.43 started using the tree of HEAD as the source of attributes + in a bare repository, which has severe performance implications. + For now, revert the change, without ripping out a more explicit + support for the attr.tree configuration variable. + source: <xmqqzft6aozg.fsf_-_@gitster.g> -* rj/add-p-typo-reaction (2024-04-21) 1 commit - - add-patch: response to unknown command - When the user responds to a prompt given by "git add -p" with an - unsupported command, list of available commands were given, which - was too much if the user knew what they wanted to type but merely - made a typo. Now the user gets a much shorter error message. +* jc/test-workaround-broken-mv (2024-05-02) 1 commit + (merged to 'next' on 2024-05-06 at 7e009c6827) + + t/lib-chunk: work around broken "mv" on some vintage of macOS - Will merge to 'next'. - source: <b209a2b8-f98f-4f14-a687-9022d30968dd@gmail.com> + Tests that try to corrupt in-repository files in chunked format did + not work well on macOS due to its broken "mv", which has been + worked around. + source: <xmqqsez0c6ma.fsf@gitster.g> -* rs/vsnprintf-failure-is-not-a-bug (2024-04-21) 1 commit - - don't report vsnprintf(3) error as bug +* jk/ci-macos-gcc13-fix (2024-05-09) 3 commits + (merged to 'next' on 2024-05-11 at 571a90f095) + + ci: stop installing "gcc-13" for osx-gcc + + ci: avoid bare "gcc" for osx-gcc job + + ci: drop mention of BREW_INSTALL_PACKAGES variable - Demote a BUG() to an die() when the failure from vsnprintf() may - not be due to a programmer error. + CI fix. + source: <20240509162219.GA1707955@coredump.intra.peff.net> - Will merge to 'next'. - source: <ea752a2b-9b74-4a59-a037-4782abf7161e@web.de> --------------------------------------------------- -[Cooking] +* jk/ci-test-with-jgit-fix (2024-05-09) 1 commit + (merged to 'next' on 2024-05-11 at 7d3d69657e) + + ci: update coverity runs_on_pool reference -* ds/format-patch-rfc-and-k (2024-04-19) 1 commit - - format-patch: ensure that --rfc and -k are mutually exclusive + CI fix. + source: <20240509161506.GA1707588@coredump.intra.peff.net> - The "-k" and "--rfc" options of "format-patch" will now error out - when used together, as one tells us not to add anything to the - title of the commit, and the other one tells us to add "RFC" in - addition to "PATCH". - Will merge to 'next'. - source: <71d195c248879e7c46fac0e84c6b0a8aa90bd2c2.1713488563.git.dsimic@manjaro.org> +* ma/win32-unix-domain-socket (2024-05-03) 1 commit + (merged to 'next' on 2024-05-06 at 799a546c96) + + win32: fix building with NO_UNIX_SOCKETS + Build fix. + source: <20240503091427.2808390-1-mh@glandium.org> -* jc/format-patch-rfc-more (2024-04-22) 2 commits - - format-patch: "--rfc=-(WIP)" appends to produce [PATCH (WIP)] - - format-patch: allow --rfc to optionally take a value, like --rfc=WIP - The "--rfc" option of "git format-patch" learned to take an - optional string value to be used in place of "RFC" to tweak the - "[PATCH]" on the subject header. +* ps/ci-enable-minimal-fuzzers-at-gitlab (2024-05-06) 1 commit + (merged to 'next' on 2024-05-07 at a76024bd9f) + + gitlab-ci: add smoke test for fuzzers + (this branch is used by ps/ci-fuzzers-at-gitlab-fix.) - Will merge to 'next'? - source: <20240421185915.1031590-1-gitster@pobox.com> + CI update. + source: <01fb94999f8e2014ba4d09ce7451a4f5d315ee72.1714371146.git.ps@pks.im> -* ps/the-index-is-no-more (2024-04-18) 6 commits - - repository: drop `initialize_the_repository()` - - repository: drop `the_index` variable - - builtin/clone: stop using `the_index` - - repository: initialize index in `repo_init()` - - builtin: stop using `the_index` - - t/helper: stop using `the_index` +* ps/ci-fuzzers-at-gitlab-fix (2024-05-09) 3 commits + (merged to 'next' on 2024-05-11 at f4307d4164) + + gitlab-ci: fix installing dependencies for fuzz smoke tests + + Merge branch 'ps/ci-python-2-deprecation' into ps/ci-fuzzers-at-gitlab-fix + + Merge branch 'ps/ci-enable-minimal-fuzzers-at-gitlab' into ps/ci-fuzzers-at-gitlab-fix + (this branch uses ps/ci-enable-minimal-fuzzers-at-gitlab and ps/ci-python-2-deprecation.) - The singleton index_state instance "the_index" has been eliminated - by always instantiating "the_repository" and replacing references - to "the_index" with references to its .index member. + CI fix. + source: <5a92a4aa9edd9653df71b284f07461c7906f97e2.1715241343.git.ps@pks.im> - Comments? - source: <cover.1713442061.git.ps@pks.im> +* ps/ci-python-2-deprecation (2024-05-06) 1 commit + (merged to 'next' on 2024-05-07 at 0e11e94f99) + + ci: fix Python dependency on Ubuntu 24.04 + (this branch is used by ps/ci-fuzzers-at-gitlab-fix.) -* pw/rebase-m-signoff-fix (2024-04-18) 6 commits - - rebase -m: fix --signoff with conflicts - - sequencer: store commit message in private context - - sequencer: move current fixups to private context - - sequencer: start removing private fields from public API - - sequencer: always free "struct replay_opts" - - Merge branch 'pw/t3428-cleanup' into pw/rebase-m-signoff-fix + Unbreak CI jobs so that we do not attempt to use Python 2 that has + been removed from the platform. + source: <cb8cefc20f373a3516695e7cbee975132553ea95.1714973381.git.ps@pks.im> - "git rebase --signoff" used to forget that it needs to add a - sign-off to the resulting commit when told to continue after a - conflict stops its operation. - Will merge to 'next'. - source: <cover.1713445918.git.phillip.wood@dunelm.org.uk> +* tb/attr-limits (2024-05-03) 1 commit + (merged to 'next' on 2024-05-06 at b98150cc71) + + attr.c: move ATTR_MAX_FILE_SIZE check into read_attr_from_buf() + The maximum size of attribute files is enforced more consistently. + source: <28f6267709db78ba526d7ed9fc4a734674697c70.1714763555.git.me@ttaylorr.com> -* mr/rerere-crash-fix (2024-04-16) 1 commit - (merged to 'next' on 2024-04-17 at 60be8e2d74) - + rerere: fix crashes due to unmatched opening conflict markers +-------------------------------------------------- +[New Topics] + +* jc/compat-regex-calloc-fix (2024-05-13) 1 commit + (merged to 'next' on 2024-05-13 at 077c4e1dcc) + + compat/regex: fix argument order to calloc(3) - When .git/rr-cache/ rerere database gets corrupted or rerere is fed to - work on a file with conflicted hunks resolved incompletely, the rerere - machinery got confused and segfaulted, which has been corrected. + Windows CI running in GitHub Actions started complaining about the + order of arguments given to calloc(); the imported regex code uses + the wrong order almost consistently, which has been corrected. Will merge to 'master'. - source: <20240416105320.1113401-1-marcel@roethke.info> + source: <xmqqbk5bim2n.fsf@gitster.g> -* pk/bisect-use-show (2024-04-15) 1 commit - (merged to 'next' on 2024-04-22 at 4dd13c288f) - + bisect: report the found commit with "show" +* jc/undecided-is-not-necessarily-sha1-fix (2024-05-13) 6 commits + - apply: fix uninitialized hash function + - builtin/hash-object: fix uninitialized hash function + - builtin/patch-id: fix uninitialized hash function + - t1517: test commands that are designed to be run outside repository + - setup: add an escape hatch for "no more default hash algorithm" change + - Merge branch 'ps/undecided-is-not-necessarily-sha1' into jc/undecided-is-not-necessarily-sha1-fix + (this branch uses ps/undecided-is-not-necessarily-sha1.) - When "git bisect" reports the commit it determined to be the - culprit, we used to show it in a format that does not honor common - UI tweaks, like log.date and log.decorate. The code has been - taught to use "git show" to follow more customizations. + The base topic started to make it an error for a command to leave + the hash algorithm unspecified, which revealed a few commands that + were not ready for the change. Give users a knob to revert back to + the "default is sha-1" behaviour as an escape hatch, and start + fixing these breakages. - Will merge to 'master'. - source: <965ae345-fd58-c46c-5a7a-de181e901f21@softwolves.pp.se> + Comments? + source: <20240513224127.2042052-1-gitster@pobox.com> -* ps/missing-btmp-fix (2024-04-15) 1 commit - (merged to 'next' on 2024-04-16 at c70779ba4b) - + pack-bitmap: gracefully handle missing BTMP chunks +* dg/fetch-pack-code-cleanup (2024-05-13) 1 commit + - fetch-pack: remove unused 'struct loose_object_iter' - GIt 2.44 introduced a regression that makes the updated code to - barf in repositories with multi-pack index written by older - versions of Git, which has been corrected. + source: <20240512005913.342287-1-dave@treblig.org> - Will merge to 'master'. - source: <a8251f8278ba9a3b41a8e299cb4918a62df6d1c7.1713163238.git.ps@pks.im> + +* dm/update-index-doc-fix (2024-05-13) 1 commit + - documentation: git-update-index: add --show-index-version to synopsis + + source: <20240512031400.28416-1-dov.murik@linux.dev> + +-------------------------------------------------- +[Cooking] + +* ps/builtin-config-cleanup (2024-05-13) 22 commits + - builtin/config: pass data between callbacks via local variables + - builtin/config: convert flags to a local variable + - builtin/config: track "fixed value" option via flags only + - builtin/config: convert `key` to a local variable + - builtin/config: convert `key_regexp` to a local variable + - builtin/config: convert `regexp` to a local variable + - builtin/config: convert `value_pattern` to a local variable + - builtin/config: convert `do_not_match` to a local variable + - builtin/config: move `respect_includes_opt` into location options + - builtin/config: move default value into display options + - builtin/config: move type options into display options + - builtin/config: move display options into local variables + - builtin/config: move location options into local variables + - builtin/config: refactor functions to have common exit paths + - config: make the config source const + - builtin/config: check for writeability after source is set up + - builtin/config: move actions into `cmd_config_actions()` + - builtin/config: move legacy options into `cmd_config()` + - builtin/config: move subcommand options into `cmd_config()` + - builtin/config: move legacy mode into its own function + - builtin/config: stop printing full usage on misuse + - Merge branch 'ps/config-subcommands' into ps/builtin-config-cleanup + (this branch uses ps/config-subcommands.) + + Code clean-up to reduce inter-function communication inside + builtin/config.c done via the use of global variables. + + Comments? + source: <cover.1715595550.git.ps@pks.im> -* rj/launch-editor-error-message (2024-04-15) 1 commit - (merged to 'next' on 2024-04-16 at 3d0dd46fc2) - + launch_editor: waiting message on error +* vd/doc-merge-tree-x-option (2024-05-07) 1 commit + (merged to 'next' on 2024-05-08 at 42637b8bdf) + + Documentation/git-merge-tree.txt: document -X - Git writes a "waiting for your editor" message on an incomplete - line after launching an editor, and then append another error - message on the same line if the editor errors out. It now clears - the "waiting for..." line before giving the error message. + Doc update. Will merge to 'master'. - source: <e208da74-8f16-44ae-912e-ae968da82057@gmail.com> + source: <pull.1728.git.1715117789985.gitgitgadget@gmail.com> + + +* jc/doc-manpages-l10n (2024-05-09) 1 commit + - SubmittingPatches: advertise git-manpages-l10n project a bit + The SubmittingPatches document now refers folks to manpages + translation project. -* rs/imap-send-simplify-cmd-issuing-codepath (2024-04-15) 1 commit - (merged to 'next' on 2024-04-17 at 0255e49f8b) - + imap-send: increase command size limit + Comments? + source: <xmqqv83muc12.fsf@gitster.g> + + +* ps/reftable-reusable-iterator (2024-05-13) 13 commits + - reftable/merged: adapt interface to allow reuse of iterators + - reftable/stack: provide convenience functions to create iterators + - reftable/reader: adapt interface to allow reuse of iterators + - reftable/generic: adapt interface to allow reuse of iterators + - reftable/generic: move seeking of records into the iterator + - reftable/merged: simplify indices for subiterators + - reftable/merged: split up initialization and seeking of records + - reftable/reader: set up the reader when initializing table iterator + - reftable/reader: inline `reader_seek_internal()` + - reftable/reader: separate concerns of table iter and reftable reader + - reftable/reader: unify indexed and linear seeking + - reftable/reader: avoid copying index iterator + - reftable/block: use `size_t` to track restart point index + + Code clean-up to make the reftable iterator closer to be reusable. + + Comments? + source: <cover.1715589670.git.ps@pks.im> - Code simplification. + +* tb/precompose-getcwd (2024-05-09) 1 commit + (merged to 'next' on 2024-05-11 at d1b507b01a) + + macOS: ls-files path fails if path of workdir is NFD + + We forgot to normalize the result of getcwd() to NFC on macOS where + all other paths are normalized, which has been corrected. Will merge to 'master'. - source: <7026075c-db4e-4d43-bbd1-d2edb52da9b7@web.de> + source: <20240509161110.12121-1-tboegi@web.de> -* rs/no-openssl-compilation-fix-on-macos (2024-04-15) 1 commit - (merged to 'next' on 2024-04-15 at 48cab93d0a) - + git-compat-util: fix NO_OPENSSL on current macOS +* jc/patch-flow-updates (2024-05-10) 2 commits + - SubmittingPatches: extend the "flow" section + - SubmittingPatches: move the patch-flow section earlier - Build fix. + Doc updates. + + Comments? + source: <20240510165526.1412338-1-gitster@pobox.com> + + +* it/refs-name-conflict (2024-05-06) 1 commit + - refs: return conflict error when checking packed refs + + Expose "name conflict" error when a ref creation fails due to D/F + conflict in the ref namespace, to improve an error message given by + "git fetch". + + Will merge to 'next'. + source: <pull.1716.v3.git.git.1714791848557.gitgitgadget@gmail.com> + + +* jc/format-patch-more-aggressive-range-diff (2024-05-06) 1 commit + - format-patch: run range-diff with larger creation-factor + + The default "creation-factor" used by "git format-patch" has been + raised to make it more aggressively find matching commits. + + Comments? + source: <xmqqbk5i3ncw.fsf_-_@gitster.g> + + +* jp/tag-trailer (2024-05-07) 3 commits + (merged to 'next' on 2024-05-07 at 646013793d) + + builtin/tag: add --trailer option + + builtin/commit: refactor --trailer logic + + builtin/commit: use ARGV macro to collect trailers + + "git tag" learned the "--trailer" option to futz with the trailers + in the same way as "git commit" does. Will merge to 'master'. - source: <3188f4e2-9744-40b1-8f05-0896b8679d25@web.de> + source: <pull.1723.v5.git.1714934950.gitgitgadget@gmail.com> -* yb/replay-doc-linkfix (2024-04-15) 1 commit - (merged to 'next' on 2024-04-15 at e8cf9cd9a8) - + Documentation: fix linkgit reference +* ow/refspec-glossary-update (2024-05-06) 1 commit + (merged to 'next' on 2024-05-07 at 7d55ebb0c8) + + Documentation: Mention that refspecs are explained elsewhere - Docfix. + Doc update. Will merge to 'master'. - source: <pull.1706.git.git.1713132482976.gitgitgadget@gmail.com> + source: <20240506182317.13477-1-oystwa@gmail.com> -* rs/apply-reject-long-name (2024-04-16) 1 commit - (merged to 'next' on 2024-04-17 at 701ccded8b) - + apply: avoid using fixed-size buffer in write_out_one_reject() +* rs/external-diff-with-exit-code (2024-05-06) 2 commits + (merged to 'next' on 2024-05-08 at ad5fee3cbf) + + diff: fix --exit-code with external diff + + diff: report unmerged paths as changes in run_diff_cmd() - The filename used for rejected hunks "git apply --reject" creates - was limited to PATH_MAX, which has been lifted. + The "--exit-code" option of "git diff" command learned to work with + the "--ext-diff" option. Will merge to 'master'. - source: <a93cd243-cb17-4ad5-8d23-30768dc5213b@web.de> + source: <82561c70-ec33-41bf-b036-52310ffc1926@web.de> -* js/for-each-repo-keep-going (2024-04-18) 2 commits - - maintenance: running maintenance should not stop on errors - - for-each-repo: optionally keep going on an error +* jt/port-ci-whitespace-check-to-gitlab (2024-05-03) 5 commits + (merged to 'next' on 2024-05-08 at 774a29dde4) + + gitlab-ci: add whitespace error check + + ci: make the whitespace report optional + + ci: separate whitespace check script + + github-ci: fix link to whitespace error + + ci: pre-collapse GitLab CI sections - A scheduled "git maintenance" job is expected to work on all - repositories it knows about, but it stopped at the first one that - errored out. Now it keeps going. + The "whitespace check" task that was enabled for GitHub Actions CI + has been ported to GitLab CI. - Expecting a hopefully small and final reroll. - Can change exit condition, which needs fixing. - cf. <20240419175621.GB14309@coredump.intra.peff.net> - source: <pull.1719.v2.git.1713444783.gitgitgadget@gmail.com> + Will merge to 'master'. + source: <20240503172110.181326-1-jltobler@gmail.com> -* ps/run-auto-maintenance-in-receive-pack (2024-04-17) 2 commits - (merged to 'next' on 2024-04-22 at cacdcac452) - + builtin/receive-pack: convert to use git-maintenance(1) - + run-command: introduce function to prepare auto-maintenance process +* jl/git-no-advice (2024-05-07) 4 commits + (merged to 'next' on 2024-05-08 at c9e7e0866e) + + t0018: two small fixes + (merged to 'next' on 2024-05-06 at 95cc03ef96) + + advice: add --no-advice global option + + doc: add spacing around paginate options + + doc: clean up usage documentation for --no-* opts - The "receive-pack" program (which responds to "git push") was not - converted to run "git maintenance --auto" when other codepaths that - used to run "git gc --auto" were updated, which has been corrected. + A new global "--no-advice" option can be used to disable all advice + messages, which is meant to be used only in scripts. Will merge to 'master'. - source: <cover.1713334241.git.ps@pks.im> + source: <20240503071706.78109-1-james@jamesliu.io> -* xx/disable-replace-when-building-midx (2024-04-17) 1 commit - - midx: disable replace objects +* kn/ref-transaction-symref (2024-05-07) 8 commits + (merged to 'next' on 2024-05-11 at 0a7119f2a3) + + refs: remove `create_symref` and associated dead code + + refs: rename `refs_create_symref()` to `refs_update_symref()` + + refs: use transaction in `refs_create_symref()` + + refs: add support for transactional symref updates + + refs: move `original_update_refname` to 'refs.c' + + refs: support symrefs in 'reference-transaction' hook + + files-backend: extract out `create_symref_lock()` + + refs: accept symref values in `ref_transaction_update()` - The procedure to build multi-pack-index got confused by the - replace-refs mechanism, which has been corrected by disabling the - latter. + Updates to symbolic refs can now be made as a part of ref + transaction. - Will merge to 'next'. - source: <pull.1711.v2.git.1712554017808.gitgitgadget@gmail.com> + Will merge to 'master'. + source: <20240507125859.132116-1-knayak@gitlab.com> + + +* ps/config-subcommands (2024-05-06) 14 commits + (merged to 'next' on 2024-05-07 at f10c689a30) + + builtin/config: display subcommand help + + builtin/config: introduce "edit" subcommand + + builtin/config: introduce "remove-section" subcommand + + builtin/config: introduce "rename-section" subcommand + + builtin/config: introduce "unset" subcommand + + builtin/config: introduce "set" subcommand + + builtin/config: introduce "get" subcommand + + builtin/config: introduce "list" subcommand + + builtin/config: pull out function to handle `--null` + + builtin/config: pull out function to handle config location + + builtin/config: use `OPT_CMDMODE()` to specify modes + + builtin/config: move "fixed-value" option to correct group + + builtin/config: move option array around + + config: clarify memory ownership when preparing comment strings + (this branch is used by ps/builtin-config-cleanup.) + + The operation mode options (like "--get") the "git config" command + uses have been deprecated and replaced with subcommands (like "git + config get"). + Will merge to 'master'. + source: <cover.1714982328.git.ps@pks.im> -* dd/t9604-use-posix-timezones (2024-04-10) 1 commit - (merged to 'next' on 2024-04-16 at 46ab81737f) - + t9604: Fix test for musl libc and new Debian - The cvsimport tests required that the platform understands - traditional timezone notations like CST6CDT, which has been - updated to work on those systems as long as they understand - POSIX notation with explicit tz transition dates. +* ps/refs-without-the-repository (2024-05-07) 5 commits + (merged to 'next' on 2024-05-08 at 2479b9de46) + + refs: remove functions without ref store + + cocci: apply rules to rewrite callers of "refs" interfaces + + cocci: introduce rules to transform "refs" to pass ref store + + refs: add `exclude_patterns` parameter to `for_each_fullref_in()` + + refs: introduce missing functions that accept a `struct ref_store` + + The refs API lost functions that implicitly assumes to work on the + primary ref_store by forcing the callers to pass a ref_store as an + argument. Will merge to 'master'. - source: <20240410032812.30476-1-congdanhqx@gmail.com> + source: <cover.1715065736.git.ps@pks.im> + +* ps/reftable-write-options (2024-05-13) 11 commits + - refs/reftable: allow configuring geometric factor + - reftable: make the compaction factor configurable + - refs/reftable: allow disabling writing the object index + - refs/reftable: allow configuring restart interval + - reftable: use `uint16_t` to track restart interval + - refs/reftable: allow configuring block size + - reftable/dump: support dumping a table's block structure + - reftable/writer: improve error when passed an invalid block size + - reftable/writer: drop static variable used to initialize strbuf + - reftable: pass opts as constant pointer + - reftable: consistently refer to `reftable_write_options` as `opts` -* kn/update-ref-symrefs (2024-04-12) 8 commits - - SQUASH??? - - refs: support symrefs in 'reference-transaction' hook - - update-ref: add support for symref-update - - update-ref: add support for symref-create - - files-backend: extract out `create_symref_lock` - - update-ref: add support for symref-delete - - update-ref: add support for symref-verify - - refs: accept symref values in `ref_transaction[_add]_update` + The knobs to tweak how reftable files are written have been made + available as configuration variables. - source: <20240412095908.1134387-1-knayak@gitlab.com> + Comments? + source: <cover.1715587849.git.ps@pks.im> -* ta/fast-import-parse-path-fix (2024-04-15) 8 commits - (merged to 'next' on 2024-04-15 at 00cc71a679) - + fast-import: make comments more precise - + fast-import: forbid escaped NUL in paths - + fast-import: document C-style escapes for paths - + fast-import: improve documentation for path quoting - + fast-import: remove dead strbuf - + fast-import: allow unquoted empty path for root - + fast-import: directly use strbufs for paths - + fast-import: tighten path unquoting +* ds/scalar-reconfigure-all-fix (2024-05-07) 1 commit + (merged to 'next' on 2024-05-08 at eca398f4a5) + + scalar: avoid segfault in reconfigure --all - The way "git fast-import" handles paths described in its input has - been tightened up and more clearly documented. + Scalar fix. Will merge to 'master'. - source: <cover.1713056559.git.thalia@archibald.dev> + source: <pull.1724.v3.git.1715126749391.gitgitgadget@gmail.com> -* xx/rfc2822-date-format-in-doc (2024-04-12) 1 commit - (merged to 'next' on 2024-04-17 at f2186bd6e8) - + Documentation: fix typos describing date format +* ps/pseudo-ref-terminology (2024-05-10) 10 commits + - refs: refuse to write pseudorefs + - ref-filter: properly distinuish pseudo and root refs + - refs: pseudorefs are no refs + - refs: classify HEAD as a root ref + - refs: root refs can be symbolic refs + - refs: refname `is_special_ref()` to `is_pseudo_ref()` + - refs: rename `is_pseudoref()` to `is_root_ref()` + - Documentation/glossary: define root refs as refs + - Documentation/glossary: clarify limitations of pseudorefs + - Documentation/glossary: redefine pseudorefs as special refs - Docfix. + Terminology to call various ref-like things are getting + straightened out. + + Comments? + source: <cover.1715330206.git.ps@pks.im> - Will merge to 'master'. - source: <pull.1716.git.1712911876943.gitgitgadget@gmail.com> - - -* la/doc-use-of-contacts-when-contributing (2024-04-18) 8 commits - - SubmittingPatches: demonstrate using git-contacts with git-send-email - - SubmittingPatches: add heading for format-patch and send-email - - SubmittingPatches: dedupe discussion of security patches - - SubmittingPatches: discuss reviewers first - - SubmittingPatches: quote commands - - SubmittingPatches: mention GitGitGadget - - SubmittingPatches: clarify 'git-contacts' location - - MyFirstContribution: mention contrib/contacts/git-contacts - - Advertise "git contacts", a tool for newcomers to find people to - ask review for their patches, a bit more in our developer - documentation. - - Will merge to 'next'? - source: <pull.1704.v6.git.1713477125.gitgitgadget@gmail.com> - - -* ps/ci-test-with-jgit (2024-04-12) 13 commits - - t0612: add tests to exercise Git/JGit reftable compatibility - - t0610: fix non-portable variable assignment - - t06xx: always execute backend-specific tests - - ci: install JGit dependency - - ci: make Perforce binaries executable for all users - - ci: merge scripts which install dependencies - - ci: fix setup of custom path for GitLab CI - - ci: merge custom PATH directories - - ci: convert "install-dependencies.sh" to use "/bin/sh" - - ci: drop duplicate package installation for "linux-gcc-default" - - ci: skip sudo when we are already root - - ci: expose distro name in dockerized GitHub jobs - - ci: rename "runs_on_pool" to "distro" - - Tests to ensure interoperability between reftable written by jgit - and our code have been added and enabled in CI. - source: <cover.1712896868.git.ps@pks.im> + +* jc/rev-parse-fatal-doc (2024-05-01) 1 commit + - rev-parse: document how --is-* options work outside a repository + + Doc update. + + Comments? + source: <xmqqplu54fbg.fsf@gitster.g> + + +* ps/undecided-is-not-necessarily-sha1 (2024-05-06) 15 commits + (merged to 'next' on 2024-05-08 at 9f8e894685) + + repository: stop setting SHA1 as the default object hash + + oss-fuzz/commit-graph: set up hash algorithm + + builtin/shortlog: don't set up revisions without repo + + builtin/diff: explicitly set hash algo when there is no repo + + builtin/bundle: abort "verify" early when there is no repository + + builtin/blame: don't access potentially unitialized `the_hash_algo` + + builtin/rev-parse: allow shortening to more than 40 hex characters + + remote-curl: fix parsing of detached SHA256 heads + + attr: fix BUG() when parsing attrs outside of repo + + attr: don't recompute default attribute source + + parse-options-cb: only abbreviate hashes when hash algo is known + + path: move `validate_headref()` to its only user + + path: harden validation of HEAD with non-standard hashes + + Merge branch 'ps/the-index-is-no-more' into ps/undecided-is-not-necessarily-sha1 + + Merge branch 'jc/no-default-attr-tree-in-bare' into ps/undecided-is-not-necessarily-sha1 + (this branch is used by jc/undecided-is-not-necessarily-sha1-fix.) + + Before discovering the repository details, We used to assume SHA-1 + as the "default" hash function, which has been corrected. Hopefully + this will smoke out codepaths that rely on such an unwarranted + assumptions. + + Will cook in 'next'. + source: <cover.1715057362.git.ps@pks.im> * pw/rebase-i-error-message (2024-04-08) 2 commits @@ -384,24 +538,6 @@ Release tarballs are available at: source: <pull.1672.v2.git.1712585787.gitgitgadget@gmail.com> -* ps/reftable-write-optim (2024-04-08) 11 commits - - reftable/block: reuse compressed array - - reftable/block: reuse zstream when writing log blocks - - reftable/writer: reset `last_key` instead of releasing it - - reftable/writer: unify releasing memory - - reftable/writer: refactorings for `writer_flush_nonempty_block()` - - reftable/writer: refactorings for `writer_add_record()` - - refs/reftable: don't recompute committer ident - - reftable: remove name checks - - refs/reftable: skip duplicate name checks - - refs/reftable: perform explicit D/F check when writing symrefs - - refs/reftable: fix D/F conflict error message on ref copy - - Code to write out reftable has seen some optimization and - simplification. - source: <cover.1712578837.git.ps@pks.im> - - * ds/send-email-per-message-block (2024-04-10) 2 commits - send-email: make it easy to discern the messages for each patch - send-email: move newline characters out of a few translatable strings @@ -426,51 +562,7 @@ Release tarballs are available at: source: <20240328101356.300374-1-e@80x24.org> -* ps/reftable-block-iteration-optim (2024-04-15) 10 commits - (merged to 'next' on 2024-04-15 at 3a2353c7f2) - + reftable/block: avoid copying block iterators on seek - + reftable/block: reuse `zstream` state on inflation - + reftable/block: open-code call to `uncompress2()` - + reftable/block: reuse uncompressed blocks - + reftable/reader: iterate to next block in place - + reftable/block: move ownership of block reader into `struct table_iter` - + reftable/block: introduce `block_reader_release()` - + reftable/block: better grouping of functions - + reftable/block: merge `block_iter_seek()` and `block_reader_seek()` - + reftable/block: rename `block_reader_start()` - - The code to iterate over reftable blocks has seen some optimization - to reduce memory allocation and deallocation. - - Will merge to 'master'. - source: <cover.1712578376.git.ps@pks.im> - - -* bc/credential-scheme-enhancement (2024-04-16) 16 commits - - credential: add method for querying capabilities - - credential-cache: implement authtype capability - - t: add credential tests for authtype - - credential: add support for multistage credential rounds - - t5563: refactor for multi-stage authentication - - docs: set a limit on credential line length - - credential: enable state capability - - credential: add an argument to keep state - - http: add support for authtype and credential - - docs: indicate new credential protocol fields - - credential: add a field called "ephemeral" - - credential: gate new fields on capability - - credential: add a field for pre-encoded credentials - - http: use new headers for each object request - - remote-curl: reset headers on new request - - credential: add an authtype field - - The credential helper protocol, together with the HTTP layer, have - been enhanced to support authentication schemes different from - username & password pair, like Bearer and NTLM. - source: <20240417000240.3611948-1-sandals@crustytoothpaste.net> - - -* tb/pseudo-merge-reachability-bitmap (2024-03-20) 24 commits +* tb/pseudo-merge-reachability-bitmap (2024-04-30) 23 commits - t/perf: implement performace tests for pseudo-merge bitmaps - pseudo-merge: implement support for finding existing merges - ewah: `bitmap_equals_ewah()` @@ -493,7 +585,6 @@ Release tarballs are available at: - pack-bitmap: move some initialization to `bitmap_writer_init()` - pack-bitmap: drop unused `max_bitmaps` parameter - ewah: implement `ewah_bitmap_is_subset()` - - config: repo_config_get_expiry() - Documentation/technical: describe pseudo-merge bitmaps format The pack-bitmap machinery learned to write pseudo-merge bitmaps, @@ -501,12 +592,13 @@ Release tarballs are available at: reference tips. This enhances bitmap coverage, and thus, performance, for repositories with many references using bitmaps. - Expecting a reroll. - cf. <ZfyxCLpjbaScIdWA@nand.local> - source: <cover.1710972293.git.me@ttaylorr.com> + Needs review. + source: <cover.1714422410.git.me@ttaylorr.com> -* la/hide-trailer-info (2024-04-19) 9 commits +* la/hide-trailer-info (2024-05-02) 11 commits + - trailer unit tests: inspect iterator contents + - trailer: document parse_trailers() usage - trailer: retire trailer_info_get() from API - trailer: make trailer_info struct private - trailer: make parse_trailers() return trailer_info pointer @@ -516,12 +608,12 @@ Release tarballs are available at: - trailer: add unit tests for trailer iterator - Makefile: sort UNIT_TEST_PROGRAMS - Merge branch 'la/format-trailer-info' into la/hide-trailer-info - (this branch uses la/format-trailer-info.) The trailer API has been reshuffled a bit. - Needs review. - source: <pull.1696.v2.git.1713504153.gitgitgadget@gmail.com> + Waiting for a review response. + cf. <a75133dc-a0bb-4f61-a616-988f2b4d5688@gmail.com> + source: <pull.1696.v4.git.1714625667.gitgitgadget@gmail.com> * ds/doc-config-reflow (2024-03-14) 1 commit @@ -534,21 +626,6 @@ Release tarballs are available at: source: <97bdaf075bf5a68554cca1731eca78aff2662907.1710444774.git.dsimic@manjaro.org> -* la/format-trailer-info (2024-03-15) 5 commits - (merged to 'next' on 2024-04-16 at dca4784407) - + trailer: finish formatting unification - + trailer: begin formatting unification - + format_trailer_info(): append newline for non-trailer lines - + format_trailer_info(): drop redundant unfold_value() - + format_trailer_info(): use trailer_item objects - (this branch is used by la/hide-trailer-info.) - - The code to format trailers have been cleaned up. - - Will merge to 'master'. - source: <pull.1694.git.1710485706.gitgitgadget@gmail.com> - - * ie/config-includeif-hostname (2024-03-19) 2 commits - config: learn the "hostname:" includeIf condition - t: add a test helper for getting hostname @@ -562,24 +639,11 @@ Release tarballs are available at: source: <20240319183722.211300-1-ignacio@iencinas.com> -* js/build-fuzz-more-often (2024-04-11) 2 commits - - fuzz: link fuzz programs with `make all` on Linux - - ci: also define CXX environment variable - - In addition to building the objects needed, try to link the objects - that are used in fuzzer tests, to make sure at least they build - without bitrot, in Linux CI runs. - - Expecting a hopefully small and final reroll. - cf. <20240412042247.GA1077925@coredump.intra.peff.net> - source: <cover.1712858920.git.steadmon@google.com> - - * cw/git-std-lib (2024-02-28) 4 commits - - SQUASH??? get rid of apparent debugging crufts - - test-stdlib: show that git-std-lib is independent - - git-std-lib: introduce Git Standard Library - - pager: include stdint.h because uintmax_t is used + . SQUASH??? get rid of apparent debugging crufts + . test-stdlib: show that git-std-lib is independent + . git-std-lib: introduce Git Standard Library + . pager: include stdint.h because uintmax_t is used Split libgit.a out to a separate git-std-lib tor easier reuse. @@ -587,33 +651,24 @@ Release tarballs are available at: source: <cover.1696021277.git.jonathantanmy@google.com> -* js/cmake-with-test-tool (2024-02-23) 2 commits - - cmake: let `test-tool` run the unit tests, too - - Merge branch 'js/unit-test-suite-runner' into js/cmake-with-test-tool - (this branch uses js/unit-test-suite-runner.) - - "test-tool" is now built in CMake build to also run the unit tests. - - May want to roll it into the base topic. - source: <pull.1666.git.1708038924522.gitgitgadget@gmail.com> - - -* js/unit-test-suite-runner (2024-02-23) 8 commits - - ci: use test-tool as unit test runner on Windows - - t/Makefile: run unit tests alongside shell tests - - unit tests: add rule for running with test-tool - - test-tool run-command testsuite: support unit tests - - test-tool run-command testsuite: remove hardcoded filter - - test-tool run-command testsuite: get shell from env - - t0080: turn t-basic unit test into a helper - - Merge branch 'jk/unit-tests-buildfix' into js/unit-test-suite-runner - (this branch is used by js/cmake-with-test-tool.) +* js/unit-test-suite-runner (2024-05-06) 9 commits + (merged to 'next' on 2024-05-07 at 3b376223e3) + + cmake: let `test-tool` run the unit tests, too + + ci: use test-tool as unit test runner on Windows + + t/Makefile: run unit tests alongside shell tests + + unit tests: add rule for running with test-tool + + test-tool run-command testsuite: support unit tests + + test-tool run-command testsuite: remove hardcoded filter + + test-tool run-command testsuite: get shell from env + + t0080: turn t-basic unit test into a helper + + Merge branch 'jk/unit-tests-buildfix' into js/unit-test-suite-runner The "test-tool" has been taught to run testsuite tests in parallel, bypassing the need to use the "prove" tool. - Needs review. - source: <cover.1708728717.git.steadmon@google.com> + Will merge to 'master'. + source: <cover.1715024899.git.steadmon@google.com> + source: <pull.1666.git.1708038924522.gitgitgadget@gmail.com> * bk/complete-dirname-for-am-and-format-patch (2024-01-12) 1 commit @@ -678,3 +733,16 @@ Release tarballs are available at: Not ready to be reviewed yet. source: <20230824205456.1231371-1-gitster@pobox.com> + +-------------------------------------------------- +[Discarded] + +* js/cmake-with-test-tool (2024-04-30) 2 commits + . cmake: let `test-tool` run the unit tests, too + . Merge branch 'js/unit-test-suite-runner' into js/cmake-with-test-tool + (this branch uses js/unit-test-suite-runner.) + + "test-tool" is now built in CMake build to also run the unit tests. + + Rolled into the base topic. + source: <pull.1666.git.1708038924522.gitgitgadget@gmail.com> |