| To: git@vger.kernel.org |
| Subject: What's cooking in git.git (May 2024, #05; Sat, 11) |
| X-master-at: 0f3415f1f8478b05e64db11eb8aaa2915e48fef6 |
| X-next-at: 78c648537befcff421d4ad73d5ad976eb9255800 |
| Bcc: lwn@lwn.net, gitster@pobox.com |
| |
| What's cooking in git.git (May 2024, #05; Sat, 11) |
| -------------------------------------------------- |
| |
| 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). |
| |
| 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-scm/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/ |
| |
| -------------------------------------------------- |
| [New Topics] |
| |
| * ps/builtin-config-cleanup (2024-05-10) 23 commits |
| - fixup! builtin/config: move location options into local variables |
| - 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. |
| |
| Will merge to 'next'? |
| source: <cover.1715339393.git.ps@pks.im> |
| |
| |
| * 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 |
| |
| Will merge to 'master'. |
| |
| -------------------------------------------------- |
| [Cooking] |
| |
| * 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 |
| |
| Doc update. |
| |
| Will merge to 'master'. |
| source: <pull.1728.git.1715117789985.gitgitgadget@gmail.com> |
| |
| |
| * 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 |
| |
| P4 update. |
| |
| Will merge to 'master'. |
| source: <pull.1668.v3.git.git.1715206266214.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. |
| |
| Comments? |
| source: <xmqqv83muc12.fsf@gitster.g> |
| |
| |
| * 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 |
| |
| CI fix. |
| |
| Will merge to 'master'. |
| source: <20240509162219.GA1707955@coredump.intra.peff.net> |
| |
| |
| * 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.) |
| |
| CI fix. |
| |
| Will merge to 'master'. |
| source: <5a92a4aa9edd9653df71b284f07461c7906f97e2.1715241343.git.ps@pks.im> |
| |
| |
| * ps/reftable-reusable-iterator (2024-05-08) 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. |
| source: <cover.1715166175.git.ps@pks.im> |
| |
| |
| * 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: <20240509161110.12121-1-tboegi@web.de> |
| |
| |
| * 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 |
| |
| CI fix. |
| |
| Will merge to 'master'. |
| source: <20240509161506.GA1707588@coredump.intra.peff.net> |
| |
| |
| * jc/patch-flow-updates (2024-05-10) 2 commits |
| - SubmittingPatches: extend the "flow" section |
| - SubmittingPatches: move the patch-flow section earlier |
| |
| 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 |
| |
| Comments? |
| cf. <CAOLa=ZSre3f+0SR-_migfkPONqhinobKjU=NnGOJ_sTNM_L5ug@mail.gmail.com> |
| 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: <pull.1723.v5.git.1714934950.gitgitgadget@gmail.com> |
| |
| |
| * 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 |
| |
| Doc update. |
| |
| Will merge to 'master'. |
| source: <20240506182317.13477-1-oystwa@gmail.com> |
| |
| |
| * 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.) |
| |
| CI update. |
| |
| Will merge to 'master'. |
| source: <01fb94999f8e2014ba4d09ce7451a4f5d315ee72.1714371146.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.) |
| |
| Unbreak CI jobs so that we do not attempt to use Python 2 that has |
| been removed from the platform. |
| |
| Will merge to 'master'. |
| source: <cb8cefc20f373a3516695e7cbee975132553ea95.1714973381.git.ps@pks.im> |
| |
| |
| * 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 "--exit-code" option of "git diff" command learned to work with |
| the "--ext-diff" option. |
| |
| Will merge to 'master'. |
| source: <82561c70-ec33-41bf-b036-52310ffc1926@web.de> |
| |
| |
| * 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 |
| |
| 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. |
| |
| Will merge to 'master'. |
| source: <xmqqsez0c6ma.fsf@gitster.g> |
| |
| |
| * 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 |
| |
| The "whitespace check" task that was enabled for GitHub Actions CI |
| has been ported to GitLab CI. |
| |
| Will merge to 'master'. |
| source: <20240503172110.181326-1-jltobler@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. |
| |
| Will merge to 'master'. |
| source: <xmqqzft6aozg.fsf_-_@gitster.g> |
| |
| |
| * 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 |
| |
| 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: <20240503071706.78109-1-james@jamesliu.io> |
| |
| |
| * 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()` |
| |
| Updates to symbolic refs can now be made as a part of ref |
| transaction. |
| |
| Will merge to 'master'. |
| source: <20240507125859.132116-1-knayak@gitlab.com> |
| |
| |
| * 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. |
| |
| Will merge to 'master'. |
| source: <20240503091427.2808390-1-mh@glandium.org> |
| |
| |
| * 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> |
| |
| |
| * 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: <cover.1715065736.git.ps@pks.im> |
| |
| |
| * ps/reftable-write-options (2024-05-10) 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: consistently pass write opts as value |
| - reftable: consistently refer to `reftable_write_options` as `opts` |
| |
| The knobs to tweak how reftable files are written have been made |
| available as configuration variables. |
| |
| Will merge to 'next'? |
| source: <cover.1715336797.git.ps@pks.im> |
| |
| |
| * 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. |
| |
| Will merge to 'master'. |
| source: <28f6267709db78ba526d7ed9fc4a734674697c70.1714763555.git.me@ttaylorr.com> |
| |
| |
| * 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 |
| |
| Scalar fix. |
| |
| Will merge to 'master'. |
| source: <pull.1724.v3.git.1715126749391.gitgitgadget@gmail.com> |
| |
| |
| * 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 |
| |
| Terminology to call various ref-like things are getting |
| straightened out. |
| |
| Comments? |
| source: <cover.1715330206.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 uses jc/no-default-attr-tree-in-bare.) |
| |
| 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 merge to 'master'. |
| source: <cover.1715057362.git.ps@pks.im> |
| |
| |
| * pw/rebase-i-error-message (2024-04-08) 2 commits |
| - rebase -i: improve error message when picking merge |
| - rebase -i: pass struct replay_opts to parse_insn_line() |
| |
| When the user adds to "git rebase -i" instruction to "pick" a merge |
| commit, the error experience is not pleasant. Such an error is now |
| caught earlier in the process that parses the todo list. |
| |
| Expecting a reroll. |
| cf. <88bc0787-e7ae-49e5-99e8-97f6c55ea8c6@gmail.com> |
| source: <pull.1672.v2.git.1712585787.gitgitgadget@gmail.com> |
| |
| |
| * 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 |
| |
| "git send-email" learned to separate its reports on each message it |
| sends out with an extra blank line in between. |
| |
| Comments? |
| source: <cover.1712732383.git.dsimic@manjaro.org> |
| |
| |
| * ew/khash-to-khashl (2024-03-28) 3 commits |
| - khashl: fix ensemble lookups on empty table |
| - treewide: switch to khashl for memory savings |
| - list-objects-filter: use kh_size API |
| |
| The hashtable library "khash.h" has been replaced with "khashl.h" |
| that has better memory usage characteristics. |
| |
| Needs review. |
| cf. <xmqqy1a4ao3t.fsf@gitster.g> |
| source: <20240328101356.300374-1-e@80x24.org> |
| |
| |
| * 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()` |
| - pack-bitmap: extra trace2 information |
| - pack-bitmap.c: use pseudo-merges during traversal |
| - t/test-lib-functions.sh: support `--date` in `test_commit_bulk()` |
| - pack-bitmap: implement test helpers for pseudo-merge |
| - ewah: implement `ewah_bitmap_popcount()` |
| - pseudo-merge: implement support for reading pseudo-merge commits |
| - pack-bitmap.c: read pseudo-merge extension |
| - pseudo-merge: scaffolding for reads |
| - pack-bitmap: extract `read_bitmap()` function |
| - pack-bitmap-write.c: write pseudo-merge table |
| - pack-bitmap-write.c: select pseudo-merge commits |
| - pseudo-merge: implement support for selecting pseudo-merge commits |
| - pack-bitmap: make `bitmap_writer_push_bitmapped_commit()` public |
| - pack-bitmap: implement `bitmap_writer_has_bitmapped_object_id()` |
| - pack-bitmap-write: support storing pseudo-merge commits |
| - pseudo-merge.ch: initial commit |
| - pack-bitmap: move some initialization to `bitmap_writer_init()` |
| - pack-bitmap: drop unused `max_bitmaps` parameter |
| - ewah: implement `ewah_bitmap_is_subset()` |
| - Documentation/technical: describe pseudo-merge bitmaps format |
| |
| The pack-bitmap machinery learned to write pseudo-merge bitmaps, |
| which act as imaginary octopus merges covering un-bitmapped |
| reference tips. This enhances bitmap coverage, and thus, |
| performance, for repositories with many references using bitmaps. |
| |
| Needs review. |
| source: <cover.1714422410.git.me@ttaylorr.com> |
| |
| |
| * 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 |
| - interpret-trailers: access trailer_info with new helpers |
| - sequencer: use the trailer iterator |
| - trailer: teach iterator about non-trailer lines |
| - trailer: add unit tests for trailer iterator |
| - Makefile: sort UNIT_TEST_PROGRAMS |
| - Merge branch 'la/format-trailer-info' into la/hide-trailer-info |
| |
| The trailer API has been reshuffled a bit. |
| |
| 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 |
| - config.txt: perform some minor reformatting |
| |
| Reflow a paragraph in the documentation source without any effect |
| to the formatted text. |
| |
| Will discard. |
| source: <97bdaf075bf5a68554cca1731eca78aff2662907.1710444774.git.dsimic@manjaro.org> |
| |
| |
| * ie/config-includeif-hostname (2024-03-19) 2 commits |
| - config: learn the "hostname:" includeIf condition |
| - t: add a test helper for getting hostname |
| |
| The conditional inclusion mechanism for configuration files learned |
| to switch on the hostname. |
| |
| Expecting a reroll. |
| cf. <20240319210428.GC1159535@coredump.intra.peff.net> |
| cf. <20240320001934.GA903718@coredump.intra.peff.net> |
| source: <20240319183722.211300-1-ignacio@iencinas.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 |
| |
| Split libgit.a out to a separate git-std-lib tor easier reuse. |
| |
| Expecting a reroll. |
| source: <cover.1696021277.git.jonathantanmy@google.com> |
| |
| |
| * 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. |
| |
| 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 |
| - completion: dir-type optargs for am, format-patch |
| |
| Command line completion support (in contrib/) has been |
| updated for a few commands to complete directory names where a |
| directory name is expected. |
| |
| Expecting a reroll. |
| cf. <40c3a824-a961-490b-94d4-4eb23c8f713d@gmail.com> |
| cf. <6683f24e-7e56-489d-be2d-8afe1fc38d2b@gmail.com> |
| source: <d37781c3-6af2-409b-95a8-660a9b92d20b@smtp-relay.sendinblue.com> |
| |
| |
| * bk/complete-send-email (2024-01-12) 1 commit |
| - completion: don't complete revs when --no-format-patch |
| |
| Command line completion support (in contrib/) has been taught to |
| avoid offering revision names as candidates to "git send-email" when |
| the command is used to send pre-generated files. |
| |
| Expecting a reroll. |
| cf. <CAC4O8c88Z3ZqxH2VVaNPpEGB3moL5dJcg3cOWuLWwQ_hLrJMtA@mail.gmail.com> |
| source: <a718b5ee-afb0-44bd-a299-3208fac43506@smtp-relay.sendinblue.com> |
| |
| |
| * tb/path-filter-fix (2024-01-31) 16 commits |
| - bloom: introduce `deinit_bloom_filters()` |
| - commit-graph: reuse existing Bloom filters where possible |
| - object.h: fix mis-aligned flag bits table |
| - commit-graph: new Bloom filter version that fixes murmur3 |
| - commit-graph: unconditionally load Bloom filters |
| - bloom: prepare to discard incompatible Bloom filters |
| - bloom: annotate filters with hash version |
| - 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 |
| - commit-graph: ensure Bloom filters are read with consistent settings |
| - revision.c: consult Bloom filters for root commits |
| - t/t4216-log-bloom.sh: harden `test_bloom_filters_not_used()` |
| |
| 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. |
| |
| Waiting for a final ack? |
| cf. <ZcFjkfbsBfk7JQIH@nand.local> |
| source: <cover.1706741516.git.me@ttaylorr.com> |
| |
| |
| * jc/rerere-cleanup (2023-08-25) 4 commits |
| - 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 |
| |
| Code clean-up. |
| |
| 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> |