mirror of
https://github.com/git/git.git
synced 2026-03-05 23:09:04 +01:00
What's cooking (2024/05 #07)
This commit is contained in:
Junio C Hamano
@@ -1,10 +1,10 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (May 2024, #06; Tue, 14)
|
||||
X-master-at: 83f1add914c6b4682de1e944ec0d1ac043d53d78
|
||||
X-next-at: 74e4eb009334be9d0c81507039d39db2634c3a6b
|
||||
Subject: What's cooking in git.git (May 2024, #07; Fri, 17)
|
||||
X-master-at: d8ab1d464d07baa30e5a180eb33b3f9aa5c93adf
|
||||
X-next-at: de53f37879660c0da62a72472ba37f8680a3587c
|
||||
Bcc: lwn@lwn.net, gitster@pobox.com
|
||||
|
||||
What's cooking in git.git (May 2024, #06; Tue, 14)
|
||||
What's cooking in git.git (May 2024, #07; Fri, 17)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking in my tree. Commits
|
||||
@@ -17,9 +17,6 @@ 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.
|
||||
@@ -51,109 +48,298 @@ Release tarballs are available at:
|
||||
--------------------------------------------------
|
||||
[Graduated to 'master']
|
||||
|
||||
* 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
|
||||
* 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
|
||||
|
||||
P4 update.
|
||||
source: <pull.1668.v3.git.git.1715206266214.gitgitgadget@gmail.com>
|
||||
Scalar fix.
|
||||
source: <pull.1724.v3.git.1715126749391.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
|
||||
* 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
|
||||
|
||||
Will merge to 'master'.
|
||||
A new global "--no-advice" option can be used to disable all advice
|
||||
messages, which is meant to be used only in scripts.
|
||||
source: <20240503071706.78109-1-james@jamesliu.io>
|
||||
|
||||
|
||||
* 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.)
|
||||
* 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 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>
|
||||
"git tag" learned the "--trailer" option to futz with the trailers
|
||||
in the same way as "git commit" does.
|
||||
source: <pull.1723.v5.git.1714934950.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* 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
|
||||
* 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
|
||||
|
||||
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>
|
||||
The "test-tool" has been taught to run testsuite tests in parallel,
|
||||
bypassing the need to use the "prove" tool.
|
||||
source: <cover.1715024899.git.steadmon@google.com>
|
||||
source: <pull.1666.git.1708038924522.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* 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
|
||||
* 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
|
||||
|
||||
CI fix.
|
||||
source: <20240509162219.GA1707955@coredump.intra.peff.net>
|
||||
The "whitespace check" task that was enabled for GitHub Actions CI
|
||||
has been ported to GitLab CI.
|
||||
source: <20240503172110.181326-1-jltobler@gmail.com>
|
||||
|
||||
|
||||
* 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
|
||||
* 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
|
||||
|
||||
CI fix.
|
||||
source: <20240509161506.GA1707588@coredump.intra.peff.net>
|
||||
Doc update.
|
||||
source: <20240506182317.13477-1-oystwa@gmail.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
|
||||
* 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.)
|
||||
|
||||
Build fix.
|
||||
source: <20240503091427.2808390-1-mh@glandium.org>
|
||||
The operation mode options (like "--get") the "git config" command
|
||||
uses have been deprecated and replaced with subcommands (like "git
|
||||
config get").
|
||||
source: <cover.1714982328.git.ps@pks.im>
|
||||
|
||||
|
||||
* 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.)
|
||||
* 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`
|
||||
(this branch is used by ps/refs-without-the-repository-updates.)
|
||||
|
||||
CI update.
|
||||
source: <01fb94999f8e2014ba4d09ce7451a4f5d315ee72.1714371146.git.ps@pks.im>
|
||||
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.
|
||||
source: <cover.1715065736.git.ps@pks.im>
|
||||
|
||||
|
||||
* 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.)
|
||||
* rs/external-diff-with-exit-code (2024-05-06) 1 commit
|
||||
(merged to 'next' on 2024-05-08 at ad5fee3cbf)
|
||||
+ diff: report unmerged paths as changes in run_diff_cmd()
|
||||
|
||||
CI fix.
|
||||
source: <5a92a4aa9edd9653df71b284f07461c7906f97e2.1715241343.git.ps@pks.im>
|
||||
The "--exit-code" option of "git diff" command learned to report
|
||||
unmerged paths as changes.
|
||||
|
||||
[jc: the tip one was reverted out]
|
||||
source: <82561c70-ec33-41bf-b036-52310ffc1926@web.de>
|
||||
|
||||
|
||||
* 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.)
|
||||
* 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
|
||||
|
||||
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>
|
||||
|
||||
|
||||
* 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>
|
||||
Doc update.
|
||||
source: <pull.1728.git.1715117789985.gitgitgadget@gmail.com>
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* tb/pack-bitmap-write-cleanups (2024-05-15) 6 commits
|
||||
- pack-bitmap: introduce `bitmap_writer_free()`
|
||||
- pack-bitmap-write.c: avoid uninitialized 'write_as' field
|
||||
- pack-bitmap: drop unused `max_bitmaps` parameter
|
||||
- pack-bitmap: avoid use of static `bitmap_writer`
|
||||
- pack-bitmap-write.c: move commit_positions into commit_pos fields
|
||||
- object.h: add flags allocated by pack-bitmap.h
|
||||
|
||||
The pack bitmap code saw some clean-up to prepare for a follow-up topic.
|
||||
|
||||
Will merge to 'next'?
|
||||
source: <cover.1715716605.git.me@ttaylorr.com>
|
||||
|
||||
|
||||
* jc/t0017-clarify-bogus-expectation (2024-05-16) 1 commit
|
||||
- t0017: clarify dubious test set-up
|
||||
|
||||
Test clean-up.
|
||||
|
||||
Will merge to 'next'?
|
||||
source: <xmqqcypmx44l.fsf@gitster.g>
|
||||
|
||||
|
||||
* kn/osxkeychain-skip-idempotent-store (2024-05-15) 2 commits
|
||||
- osxkeychain: state to skip unnecessary store operations
|
||||
- osxkeychain: exclusive lock to serialize execution of operations
|
||||
|
||||
The credential helper that talks with osx keychain learned to avoid
|
||||
storing back the authentication material it just got received from
|
||||
the keychain.
|
||||
|
||||
Comments?
|
||||
source: <pull.1729.v3.git.1715800868.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* kn/update-ref-symref (2024-05-15) 7 commits
|
||||
- update-ref: add support for 'symref-update' command
|
||||
- reftable: pick either 'oid' or 'target' for new updates
|
||||
- update-ref: add support for 'symref-create' command
|
||||
- update-ref: add support for 'symref-delete' command
|
||||
- update-ref: add support for 'symref-verify' command
|
||||
- refs: create and use `ref_update_ref_must_exist()`
|
||||
- Merge branch 'kn/ref-transaction-symref' into kn/update-ref-symref
|
||||
(this branch uses kn/ref-transaction-symref.)
|
||||
|
||||
"git update-ref --stdin" learned to handle transactional updates of
|
||||
symbolic-refs.
|
||||
|
||||
Expecting a reroll.
|
||||
cf. <ZkXpcvF6dxGr6qmj@tanuki>
|
||||
source: <20240514124411.1037019-1-knayak@gitlab.com>
|
||||
|
||||
|
||||
* mt/t0211-typofix (2024-05-16) 1 commit
|
||||
- t/t0211-trace2-perf.sh: fix typo patern -> pattern
|
||||
|
||||
Test fix.
|
||||
|
||||
Will merge to 'next'.
|
||||
source: <ZkW5ggOVlglfi64u@telcontar>
|
||||
|
||||
|
||||
* ps/complete-config-w-subcommands (2024-05-17) 1 commit
|
||||
- completion: adapt git-config(1) to complete subcommands
|
||||
|
||||
Update the command line completion script (in contrib/) to adjust
|
||||
to the recent update to "git config" that adopted subcommand based
|
||||
UI.
|
||||
|
||||
Will merge to 'next'.
|
||||
source: <8d43dee33289969a5afbbf7635ac40b7312d8e19.1715926344.git.ps@pks.im>
|
||||
|
||||
|
||||
* ps/refs-without-the-repository-updates (2024-05-17) 17 commits
|
||||
- refs/packed: remove references to `the_hash_algo`
|
||||
- refs/files: remove references to `the_hash_algo`
|
||||
- refs/files: use correct repository
|
||||
- refs: remove `dwim_log()`
|
||||
- refs: drop `git_default_branch_name()`
|
||||
- refs: pass repo when peeling objects
|
||||
- refs: move object peeling into "object.c"
|
||||
- refs: pass ref store when detecting dangling symrefs
|
||||
- refs: convert iteration over replace refs to accept ref store
|
||||
- refs: retrieve worktree ref stores via associated repository
|
||||
- refs: refactor `resolve_gitlink_ref()` to accept a repository
|
||||
- refs: pass repo when retrieving submodule ref store
|
||||
- refs: track ref stores via strmap
|
||||
- refs: implement releasing ref storages
|
||||
- refs: rename `init_db` callback to avoid confusion
|
||||
- refs: adjust names for `init` and `init_db` callbacks
|
||||
- Merge branch 'ps/refs-without-the-repository' into ps/refs-without-the-repository-updates
|
||||
|
||||
Further clean-up the refs subsystem to stop relying on
|
||||
the_repository, and instead use the repository associated to the
|
||||
ref_store object.
|
||||
|
||||
Will merge to 'next'?
|
||||
source: <cover.1715929858.git.ps@pks.im>
|
||||
|
||||
|
||||
* jc/doc-diff-name-only (2024-05-17) 1 commit
|
||||
- diff: document what --name-only shows
|
||||
|
||||
The documentation for "git diff --name-only" has been clarified
|
||||
that it is about showing the names in the post-image tree.
|
||||
|
||||
Will merge to 'next'.
|
||||
source: <xmqqeda0jr7d.fsf@gitster.g>
|
||||
|
||||
|
||||
* kn/patch-iteration-doc (2024-05-17) 2 commits
|
||||
- SubmittingPatches: add section for iterating patches
|
||||
- Merge branch 'jc/patch-flow-updates' into kn/patch-iteration-doc
|
||||
(this branch uses jc/patch-flow-updates.)
|
||||
|
||||
Doc updates.
|
||||
|
||||
Will merge to 'next'.
|
||||
source: <20240517122724.270706-1-knayak@gitlab.com>
|
||||
|
||||
|
||||
* mt/openindiana-portability (2024-05-17) 7 commits
|
||||
(merged to 'next' on 2024-05-17 at de53f37879)
|
||||
+ t/t9001-send-email.sh: sed - remove the i flag for s
|
||||
+ t/t9118-git-svn-funky-branch-names.sh: sed needs semicolon
|
||||
+ t/t1700-split-index.sh: mv -v is not portable
|
||||
+ t/t4202-log.sh: fix misspelled variable
|
||||
+ t/t0600-reffiles-backend.sh: rm -v is not portable
|
||||
+ t/t9902-completion.sh: backslashes in echo
|
||||
+ Switch grep from non-portable BRE to portable ERE
|
||||
|
||||
Portability updates to various uses of grep and sed.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <ZkeMiifGHkIsehz3@telcontar>
|
||||
|
||||
|
||||
* mt/openindiana-scalar (2024-05-17) 1 commit
|
||||
- scalar: make enlistment delete to work on all POSIX platforms
|
||||
|
||||
Avoid removing the $(cwd) for portability.
|
||||
|
||||
Needs review.
|
||||
source: <Zkds81OB7C5bTCl_@telcontar>
|
||||
|
||||
|
||||
* ts/archive-prefix-with-add-virtual-file (2024-05-17) 1 commit
|
||||
- archive: make --add-virtual-file honor --prefix
|
||||
|
||||
source: <pull.1719.v2.git.git.1715967267420.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* js/doc-decisions (2024-05-17) 1 commit
|
||||
- doc: describe the project's decision-making process
|
||||
|
||||
The project decision making policy has been documented.
|
||||
source: <10f217915600eda3ebec886e4f020f87c22e318a.1715978031.git.steadmon@google.com>
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* 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)
|
||||
@@ -166,7 +352,7 @@ Release tarballs are available at:
|
||||
source: <xmqqbk5bim2n.fsf@gitster.g>
|
||||
|
||||
|
||||
* jc/undecided-is-not-necessarily-sha1-fix (2024-05-13) 6 commits
|
||||
* jc/undecided-is-not-necessarily-sha1-fix (2024-05-16) 6 commits
|
||||
- apply: fix uninitialized hash function
|
||||
- builtin/hash-object: fix uninitialized hash function
|
||||
- builtin/patch-id: fix uninitialized hash function
|
||||
@@ -186,20 +372,26 @@ Release tarballs are available at:
|
||||
|
||||
|
||||
* dg/fetch-pack-code-cleanup (2024-05-13) 1 commit
|
||||
- fetch-pack: remove unused 'struct loose_object_iter'
|
||||
(merged to 'next' on 2024-05-17 at c8f8136d2e)
|
||||
+ fetch-pack: remove unused 'struct loose_object_iter'
|
||||
|
||||
Code clean-up to remove an unused struct definition.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <20240512005913.342287-1-dave@treblig.org>
|
||||
|
||||
|
||||
* dm/update-index-doc-fix (2024-05-13) 1 commit
|
||||
- documentation: git-update-index: add --show-index-version to synopsis
|
||||
(merged to 'next' on 2024-05-17 at 2f6cd0d1cc)
|
||||
+ documentation: git-update-index: add --show-index-version to synopsis
|
||||
|
||||
Doc fix.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <20240512031400.28416-1-dov.murik@linux.dev>
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* ps/builtin-config-cleanup (2024-05-13) 22 commits
|
||||
* ps/builtin-config-cleanup (2024-05-15) 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
|
||||
@@ -222,32 +414,21 @@ Release tarballs are available at:
|
||||
- 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>
|
||||
Will merge to 'next'?
|
||||
source: <cover.1715755055.git.ps@pks.im>
|
||||
|
||||
|
||||
* 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>
|
||||
|
||||
|
||||
* jc/doc-manpages-l10n (2024-05-09) 1 commit
|
||||
* jc/doc-manpages-l10n (2024-05-17) 1 commit
|
||||
- SubmittingPatches: advertise git-manpages-l10n project a bit
|
||||
|
||||
The SubmittingPatches document now refers folks to manpages
|
||||
translation project.
|
||||
|
||||
Comments?
|
||||
Will merge to 'next'.
|
||||
source: <xmqqv83muc12.fsf@gitster.g>
|
||||
|
||||
|
||||
@@ -284,23 +465,26 @@ Release tarballs are available at:
|
||||
|
||||
|
||||
* jc/patch-flow-updates (2024-05-10) 2 commits
|
||||
- SubmittingPatches: extend the "flow" section
|
||||
- SubmittingPatches: move the patch-flow section earlier
|
||||
(merged to 'next' on 2024-05-16 at d7a885574b)
|
||||
+ SubmittingPatches: extend the "flow" section
|
||||
+ SubmittingPatches: move the patch-flow section earlier
|
||||
(this branch is used by kn/patch-iteration-doc.)
|
||||
|
||||
Doc updates.
|
||||
|
||||
Comments?
|
||||
Will merge to 'master'.
|
||||
source: <20240510165526.1412338-1-gitster@pobox.com>
|
||||
|
||||
|
||||
* it/refs-name-conflict (2024-05-06) 1 commit
|
||||
- refs: return conflict error when checking packed refs
|
||||
(merged to 'next' on 2024-05-15 at 39ef3ecc88)
|
||||
+ 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'.
|
||||
Will merge to 'master'.
|
||||
source: <pull.1716.v3.git.git.1714791848557.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
@@ -314,71 +498,6 @@ Release tarballs are available at:
|
||||
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>
|
||||
|
||||
|
||||
* 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>
|
||||
|
||||
|
||||
* 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>
|
||||
|
||||
|
||||
* 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
|
||||
@@ -389,6 +508,7 @@ Release tarballs are available at:
|
||||
+ refs: support symrefs in 'reference-transaction' hook
|
||||
+ files-backend: extract out `create_symref_lock()`
|
||||
+ refs: accept symref values in `ref_transaction_update()`
|
||||
(this branch is used by kn/update-ref-symref.)
|
||||
|
||||
Updates to symbolic refs can now be made as a part of ref
|
||||
transaction.
|
||||
@@ -397,48 +517,6 @@ Release tarballs are available at:
|
||||
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>
|
||||
|
||||
|
||||
* 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-13) 11 commits
|
||||
- refs/reftable: allow configuring geometric factor
|
||||
- reftable: make the compaction factor configurable
|
||||
@@ -459,23 +537,13 @@ Release tarballs are available at:
|
||||
source: <cover.1715587849.git.ps@pks.im>
|
||||
|
||||
|
||||
* 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
|
||||
* ps/pseudo-ref-terminology (2024-05-15) 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: do not check ref existence in `is_root_ref()`
|
||||
- refs: rename `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
|
||||
@@ -484,8 +552,9 @@ Release tarballs are available at:
|
||||
Terminology to call various ref-like things are getting
|
||||
straightened out.
|
||||
|
||||
Comments?
|
||||
source: <cover.1715330206.git.ps@pks.im>
|
||||
Will merge to 'next'?
|
||||
cf. <vgzwb5xnlvz2gfiqamzrfcjs2xya3zhhoootyzopfpdrjapayq@wfsomyal4cf6>
|
||||
source: <cover.1715755591.git.ps@pks.im>
|
||||
|
||||
|
||||
* jc/rev-parse-fatal-doc (2024-05-01) 1 commit
|
||||
@@ -538,15 +607,15 @@ Release tarballs are available at:
|
||||
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
|
||||
* ds/send-email-per-message-block (2024-04-10) 1 commit
|
||||
- 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.
|
||||
Preliminary code clean-up for "git send-email".
|
||||
|
||||
Comments?
|
||||
source: <cover.1712732383.git.dsimic@manjaro.org>
|
||||
Will merge to 'next'.
|
||||
The topmost commit in the original series was dropped per author's request.
|
||||
cf. <a07d3807a24f6d68cb48ee48366ae25e@manjaro.org>
|
||||
source: <29ea3a9b07bf1aa17b5d6a1e41325379c494bcb2.1712732383.git.dsimic@manjaro.org>
|
||||
|
||||
|
||||
* ew/khash-to-khashl (2024-03-28) 3 commits
|
||||
@@ -562,57 +631,23 @@ Release tarballs are available at:
|
||||
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
|
||||
(merged to 'next' on 2024-05-15 at 955ffe4f37)
|
||||
+ 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>
|
||||
Will merge to 'master'.
|
||||
source: <pull.1696.v4.git.1714625667.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
@@ -651,26 +686,6 @@ Release tarballs are available at:
|
||||
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
|
||||
|
||||
@@ -737,12 +752,35 @@ Release tarballs are available at:
|
||||
--------------------------------------------------
|
||||
[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.)
|
||||
* 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
|
||||
|
||||
"test-tool" is now built in CMake build to also run the unit tests.
|
||||
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.
|
||||
|
||||
Rolled into the base topic.
|
||||
source: <pull.1666.git.1708038924522.gitgitgadget@gmail.com>
|
||||
Retracted to be rebuilt on top of tb/pack-bitmap-write-cleanups topic
|
||||
source: <cover.1714422410.git.me@ttaylorr.com>
|
||||
|
||||
Reference in New Issue
Block a user