mirror of
https://github.com/git/git.git
synced 2026-01-12 13:53:11 +09:00
What's cooking (2023/08 #08)
This commit is contained in:
Junio C Hamano
parent
5fe49c18f1
commit
d82fdc2e24
@ -1,10 +1,10 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Aug 2023, #07; Fri, 25)
|
||||
X-master-at: 6807fcfedab84bc8cd0fbf721bc13c4e68cda9ae
|
||||
X-next-at: f2c9fb9f5c8eb1d665cf784c008132152540004c
|
||||
Subject: What's cooking in git.git (Aug 2023, #08; Mon, 28)
|
||||
X-master-at: 5dc72c0fbcbccf7dbb42e470e55dafbd2afdf343
|
||||
X-next-at: 7437a81fcf65029fe0d26191d952ee59c0ab922b
|
||||
Bcc: lwn@lwn.net, gitster@pobox.com
|
||||
|
||||
What's cooking in git.git (Aug 2023, #07; Fri, 25)
|
||||
What's cooking in git.git (Aug 2023, #08; Mon, 28)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking in my tree. Commits
|
||||
@ -19,7 +19,7 @@ arise).
|
||||
|
||||
The cycle for 2.43 has started. Hopefully we can drain the topics
|
||||
that have been cooking in 'next' during the pre-release freeze
|
||||
period down to 'master' by the end of next week.
|
||||
period down to 'master' by the end of this week.
|
||||
|
||||
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
|
||||
@ -50,135 +50,109 @@ Release tarballs are available at:
|
||||
https://www.kernel.org/pub/software/scm/git/
|
||||
|
||||
--------------------------------------------------
|
||||
[Graduated to 'master']
|
||||
[New Topics]
|
||||
|
||||
* ds/maintenance-schedule-fuzz (2023-08-10) 8 commits
|
||||
(merged to 'next' on 2023-08-18 at 8d17424818)
|
||||
+ maintenance: update schedule before config
|
||||
+ maintenance: fix systemd schedule overlaps
|
||||
+ maintenance: use random minute in systemd scheduler
|
||||
+ maintenance: swap method locations
|
||||
+ maintenance: use random minute in cron scheduler
|
||||
+ maintenance: use random minute in Windows scheduler
|
||||
+ maintenance: use random minute in launchctl scheduler
|
||||
+ maintenance: add get_random_minute()
|
||||
* rs/parse-options-help-text-is-optional (2023-08-28) 1 commit
|
||||
- parse-options: allow omitting option help text
|
||||
|
||||
Hourly and other schedule of "git maintenance" jobs are randomly
|
||||
distributed now.
|
||||
source: <pull.1567.v2.git.1691699987.gitgitgadget@gmail.com>
|
||||
It may be tempting to leave the help text NULL for a command line
|
||||
option that is either hidden or too obvious, but "git subcmd -h"
|
||||
and "git subcmd --help-all" would have segfaulted if done so. Now
|
||||
the help text is optional.
|
||||
|
||||
|
||||
* ds/upload-pack-error-sequence-fix (2023-08-16) 2 commits
|
||||
(merged to 'next' on 2023-08-16 at d0522d547d)
|
||||
+ upload-pack: fix exit code when denying fetch of unreachable object ID
|
||||
(merged to 'next' on 2023-08-13 at 6c740593cf)
|
||||
+ upload-pack: fix race condition in error messages
|
||||
|
||||
Error message generation fix.
|
||||
source: <pull.1572.git.1691678450757.gitgitgadget@gmail.com>
|
||||
source: <fe028981d353158e9840eb035194ca15e6a2c15e.1692165840.git.ps@pks.im>
|
||||
|
||||
|
||||
* ja/worktree-orphan (2023-08-13) 1 commit
|
||||
(merged to 'next' on 2023-08-18 at b2a6f7fb71)
|
||||
+ builtin/worktree.c: fix typo in "forgot fetch" msg
|
||||
|
||||
Typofix in an error message.
|
||||
source: <20230811233940.30264-1-jacobabel@nullpo.dev>
|
||||
|
||||
|
||||
* jk/function-pointer-mismatches-fix (2023-08-19) 1 commit
|
||||
(merged to 'next' on 2023-08-19 at d59a3bf2b4)
|
||||
+ hashmap: use expected signatures for comparison functions
|
||||
|
||||
Code clean-up to please clang-18.
|
||||
source: <20230819235530.GB600744@coredump.intra.peff.net>
|
||||
|
||||
|
||||
* mp/rebase-label-length-limit (2023-08-10) 2 commits
|
||||
(merged to 'next' on 2023-08-13 at 85536da9f7)
|
||||
+ rebase: allow overriding the maximal length of the generated labels
|
||||
+ sequencer: truncate labels to accommodate loose refs
|
||||
|
||||
Overly long label names used in the sequencer machinery are now
|
||||
chopped to fit under filesystem limitation.
|
||||
source: <pull.1562.git.git.1691685300.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* ob/sequencer-rearrange-cleanup (2023-08-09) 1 commit
|
||||
(merged to 'next' on 2023-08-09 at df4360945c)
|
||||
+ sequencer: simplify allocation of result array in todo_list_rearrange_squash()
|
||||
|
||||
Code clean-up.
|
||||
source: <20230809171532.2564880-1-oswald.buddenhagen@gmx.de>
|
||||
|
||||
|
||||
* ob/t9001-indent-fix (2023-08-13) 1 commit
|
||||
(merged to 'next' on 2023-08-18 at 00c1cf4fe7)
|
||||
+ t9001: fix indentation in test_no_confirm()
|
||||
|
||||
Test style fix.
|
||||
source: <20230813104649.2919412-1-oswald.buddenhagen@gmx.de>
|
||||
|
||||
|
||||
* ob/test-lib-rebase-fake-editor-updates (2023-08-10) 3 commits
|
||||
(merged to 'next' on 2023-08-13 at 16b87e890a)
|
||||
+ t/lib-rebase: improve documentation of set_fake_editor()
|
||||
+ t/lib-rebase: set_fake_editor(): handle FAKE_LINES more consistently
|
||||
+ t/lib-rebase: set_fake_editor(): fix recognition of reset's short command
|
||||
|
||||
Test updates.
|
||||
source: <20230807170935.2336663-1-oswald.buddenhagen@gmx.de>
|
||||
source: <20230809171531.2564785-1-oswald.buddenhagen@gmx.de>
|
||||
|
||||
|
||||
* rj/branch-in-use-error-message (2023-08-08) 2 commits
|
||||
(merged to 'next' on 2023-08-09 at 5510985b1c)
|
||||
+ branch: error message checking out a branch in use
|
||||
+ branch: error message deleting a branch in use
|
||||
|
||||
A message written in olden time prevented a branch from getting
|
||||
checked out saying it is already checked out elsewhere, but these
|
||||
days, we treat a branch that is being bisected or rebased just like
|
||||
a branch that is checked out and protect it. Rephrase the message
|
||||
to say that the branch is in use.
|
||||
source: <7710c002-0832-d8f6-59b8-30119bd5efe6@gmail.com>
|
||||
|
||||
|
||||
* rs/parse-options-negation-help (2023-08-06) 8 commits
|
||||
(merged to 'next' on 2023-08-18 at 9d37b5fbfe)
|
||||
+ parse-options: simplify usage_padding()
|
||||
+ parse-options: no --[no-]no-...
|
||||
+ parse-options: factor out usage_indent() and usage_padding()
|
||||
+ parse-options: show negatability of options in short help
|
||||
+ t1502: test option negation
|
||||
+ t1502: move optionspec help output to a file
|
||||
+ t1502, docs: disallow --no-help
|
||||
+ subtree: disallow --no-{help,quiet,debug,branch,message}
|
||||
|
||||
"git cmd -h" learned to signal which options can be negated by
|
||||
listing such options like "--[no-]opt".
|
||||
cf. <xmqqbkfm3gne.fsf@gitster.g>
|
||||
source: <e4d46d97-1cd4-7fea-afd1-7de5023b1b09@web.de>
|
||||
|
||||
|
||||
* tb/repack-geometry-cleanup (2023-08-09) 1 commit
|
||||
(merged to 'next' on 2023-08-13 at d79c778057)
|
||||
+ repack: move `pack_geometry` struct to the stack
|
||||
|
||||
Code clean-up.
|
||||
source: <2e2a760381be1f7cdae83e2f43b17d16aa8ab161.1691613149.git.me@ttaylorr.com>
|
||||
|
||||
|
||||
* ws/git-push-doc-grammofix (2023-08-09) 1 commit
|
||||
(merged to 'next' on 2023-08-13 at f15e9bbe75)
|
||||
+ git-push.txt: fix grammar
|
||||
|
||||
Doc update.
|
||||
source: <20230810012105.1423462-1-wesleys@opperschaap.net>
|
||||
Will merge to 'next'.
|
||||
source: <2b08dc43-621d-2170-c4a6-c2aac33a9a19@web.de>
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
[Graduated to 'master']
|
||||
|
||||
* mh/credential-erase-improvements-more (2023-07-26) 2 commits
|
||||
(merged to 'next' on 2023-08-08 at fd1ba4accf)
|
||||
+ credential/wincred: erase matching creds only
|
||||
+ credential/libsecret: erase matching creds only
|
||||
|
||||
Update two credential helpers to correctly match which credential
|
||||
to erase; they dropped not the ones with stale password.
|
||||
source: <pull.1527.v2.git.git.1690387585634.gitgitgadget@gmail.com>
|
||||
source: <pull.1529.git.git.1687596777147.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* mh/credential-libsecret-attrs (2023-06-16) 1 commit
|
||||
(merged to 'next' on 2023-08-08 at dc73a2c55a)
|
||||
+ credential/libsecret: store new attributes
|
||||
|
||||
The way authentication related data other than passwords (e.g.
|
||||
oath token and password expiration data) are stored in libsecret
|
||||
keyrings has been rethought.
|
||||
source: <pull.1469.v5.git.git.1686945306242.gitgitgadget@gmail.com>
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* cc/repack-sift-filtered-objects-to-separate-pack (2023-08-13) 8 commits
|
||||
. gc: add `gc.repackFilterTo` config option
|
||||
. repack: implement `--filter-to` for storing filtered out objects
|
||||
. gc: add `gc.repackFilter` config option
|
||||
. repack: add `--filter=<filter-spec>` option
|
||||
. repack: refactor finding pack prefix
|
||||
. repack: refactor finishing pack-objects command
|
||||
. t/helper: add 'find-pack' test-tool
|
||||
. pack-objects: allow `--filter` without `--stdout`
|
||||
|
||||
"git repack" machinery learns to pay attention to the "--filter="
|
||||
option.
|
||||
|
||||
Kicked out of the 'seen', as it still seems to be failing tests.
|
||||
cf. https://github.com/git/git/actions/runs/5850998716/job/15861158252#step:4:1822
|
||||
source: <20230812000011.1227371-1-christian.couder@gmail.com>
|
||||
|
||||
|
||||
* ob/send-email-interactive-failure (2023-08-21) 1 commit
|
||||
- send-email: prompt-dependent exit codes
|
||||
|
||||
"git send-email" exits with non-zero status when end-user
|
||||
interaction causes any prepared message not to be sent.
|
||||
|
||||
Expecting a reroll.
|
||||
Without an opt-in fix, this will be a backward-incompatible
|
||||
change that needs mention in the release notes.
|
||||
source: <20230821170720.577835-1-oswald.buddenhagen@gmx.de>
|
||||
|
||||
|
||||
* cc/git-replay (2023-06-03) 15 commits
|
||||
- replay: stop assuming replayed branches do not diverge
|
||||
- replay: add --contained to rebase contained branches
|
||||
- replay: add --advance or 'cherry-pick' mode
|
||||
- replay: disallow revision specific options and pathspecs
|
||||
- replay: use standard revision ranges
|
||||
- replay: make it a minimal server side command
|
||||
- replay: remove HEAD related sanity check
|
||||
- replay: remove progress and info output
|
||||
- replay: add an important FIXME comment about gpg signing
|
||||
- replay: don't simplify history
|
||||
- replay: introduce pick_regular_commit()
|
||||
- replay: die() instead of failing assert()
|
||||
- replay: start using parse_options API
|
||||
- replay: introduce new builtin
|
||||
- t6429: remove switching aspects of fast-rebase
|
||||
|
||||
No reviews?
|
||||
source: <20230602102533.876905-1-christian.couder@gmail.com>
|
||||
|
||||
|
||||
* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit
|
||||
- cherry-pick: refuse cherry-pick sequence if index is dirty
|
||||
|
||||
"git cherry-pick A" that replays a single commit stopped before
|
||||
clobbering local modification, but "git cherry-pick A..B" did not,
|
||||
which has been corrected.
|
||||
|
||||
Expecting a reroll.
|
||||
cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>
|
||||
source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* jk/diff-result-code-cleanup (2023-08-21) 7 commits
|
||||
(merged to 'next' on 2023-08-25 at 3b1280d42f)
|
||||
@ -258,33 +232,39 @@ Release tarballs are available at:
|
||||
|
||||
|
||||
* jc/ci-skip-same-commit (2023-08-25) 1 commit
|
||||
- ci: avoid building from the same commit in parallel
|
||||
(merged to 'next' on 2023-08-28 at e978717961)
|
||||
+ ci: avoid building from the same commit in parallel
|
||||
|
||||
Tweak GitHub Actions CI so that pushing the same commit to multiple
|
||||
branch tips at the same time will not waste building and testing
|
||||
the same thing twice.
|
||||
|
||||
Will merge to 'next'.
|
||||
Will merge to 'master'.
|
||||
source: <1da763f3-60bf-a572-2c71-336b1fa5553d@gmx.de>
|
||||
|
||||
|
||||
* py/git-gui-updates (2023-08-24) 16 commits
|
||||
- Merge https://github.com/prati0100/git-gui
|
||||
- Merge branch 'ml/cygwin-fixes'
|
||||
- git-gui - use mkshortcut on Cygwin
|
||||
- git-gui - use cygstart to browse on Cygwin
|
||||
- git-gui - remove obsolete Cygwin specific code
|
||||
- git gui Makefile - remove Cygwin modifications
|
||||
- Merge branch 'ab/makeflags'
|
||||
- Makefiles: change search through $(MAKEFLAGS) for GNU make 4.4
|
||||
- Merge branch 'js/windows-rce'
|
||||
- Work around Tcl's default `PATH` lookup
|
||||
- Move the `_which` function (almost) to the top
|
||||
- Move is_<platform> functions to the beginning
|
||||
- is_Cygwin: avoid `exec`ing anything
|
||||
- windows: ignore empty `PATH` elements
|
||||
- Merge branch 'vk/readme-typo'
|
||||
- git-gui: Fix a typo in README
|
||||
(merged to 'next' on 2023-08-28 at df0b742344)
|
||||
+ Merge https://github.com/prati0100/git-gui
|
||||
+ Merge branch 'ml/cygwin-fixes'
|
||||
+ git-gui - use mkshortcut on Cygwin
|
||||
+ git-gui - use cygstart to browse on Cygwin
|
||||
+ git-gui - remove obsolete Cygwin specific code
|
||||
+ git gui Makefile - remove Cygwin modifications
|
||||
+ Merge branch 'ab/makeflags'
|
||||
+ Makefiles: change search through $(MAKEFLAGS) for GNU make 4.4
|
||||
+ Merge branch 'js/windows-rce'
|
||||
+ Work around Tcl's default `PATH` lookup
|
||||
+ Move the `_which` function (almost) to the top
|
||||
+ Move is_<platform> functions to the beginning
|
||||
+ is_Cygwin: avoid `exec`ing anything
|
||||
+ windows: ignore empty `PATH` elements
|
||||
+ Merge branch 'vk/readme-typo'
|
||||
+ git-gui: Fix a typo in README
|
||||
|
||||
Git GUI updates.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* tb/mark-more-tests-as-leak-free (2023-08-24) 3 commits
|
||||
@ -294,73 +274,6 @@ Release tarballs are available at:
|
||||
|
||||
source: <cover.1692902414.git.me@ttaylorr.com>
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* cc/repack-sift-filtered-objects-to-separate-pack (2023-08-13) 8 commits
|
||||
. gc: add `gc.repackFilterTo` config option
|
||||
. repack: implement `--filter-to` for storing filtered out objects
|
||||
. gc: add `gc.repackFilter` config option
|
||||
. repack: add `--filter=<filter-spec>` option
|
||||
. repack: refactor finding pack prefix
|
||||
. repack: refactor finishing pack-objects command
|
||||
. t/helper: add 'find-pack' test-tool
|
||||
. pack-objects: allow `--filter` without `--stdout`
|
||||
|
||||
"git repack" machinery learns to pay attention to the "--filter="
|
||||
option.
|
||||
|
||||
Kicked out of the 'seen', as it still seems to be failing tests.
|
||||
cf. https://github.com/git/git/actions/runs/5850998716/job/15861158252#step:4:1822
|
||||
source: <20230812000011.1227371-1-christian.couder@gmail.com>
|
||||
|
||||
|
||||
* ob/send-email-interactive-failure (2023-08-21) 1 commit
|
||||
- send-email: prompt-dependent exit codes
|
||||
|
||||
"git send-email" exits with non-zero status when end-user
|
||||
interaction causes any prepared message not to be sent.
|
||||
|
||||
Expecting a reroll.
|
||||
Without an opt-in fix, this will be a backward-incompatible
|
||||
change that needs mention in the release notes.
|
||||
source: <20230821170720.577835-1-oswald.buddenhagen@gmx.de>
|
||||
|
||||
|
||||
* cc/git-replay (2023-06-03) 15 commits
|
||||
- replay: stop assuming replayed branches do not diverge
|
||||
- replay: add --contained to rebase contained branches
|
||||
- replay: add --advance or 'cherry-pick' mode
|
||||
- replay: disallow revision specific options and pathspecs
|
||||
- replay: use standard revision ranges
|
||||
- replay: make it a minimal server side command
|
||||
- replay: remove HEAD related sanity check
|
||||
- replay: remove progress and info output
|
||||
- replay: add an important FIXME comment about gpg signing
|
||||
- replay: don't simplify history
|
||||
- replay: introduce pick_regular_commit()
|
||||
- replay: die() instead of failing assert()
|
||||
- replay: start using parse_options API
|
||||
- replay: introduce new builtin
|
||||
- t6429: remove switching aspects of fast-rebase
|
||||
|
||||
No reviews?
|
||||
source: <20230602102533.876905-1-christian.couder@gmail.com>
|
||||
|
||||
|
||||
* tk/cherry-pick-sequence-requires-clean-worktree (2023-06-01) 1 commit
|
||||
- cherry-pick: refuse cherry-pick sequence if index is dirty
|
||||
|
||||
"git cherry-pick A" that replays a single commit stopped before
|
||||
clobbering local modification, but "git cherry-pick A..B" did not,
|
||||
which has been corrected.
|
||||
|
||||
Expecting a reroll.
|
||||
cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>
|
||||
source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* ob/sequencer-empty-hint-fix (2023-08-24) 1 commit
|
||||
(merged to 'next' on 2023-08-24 at 626c52ad72)
|
||||
@ -425,13 +338,15 @@ Release tarballs are available at:
|
||||
source: <20230821170720.577820-1-oswald.buddenhagen@gmx.de>
|
||||
|
||||
|
||||
* ds/scalar-updates (2023-08-22) 3 commits
|
||||
- scalar reconfigure: help users remove buggy repos
|
||||
- setup: add discover_git_directory_reason()
|
||||
- scalar: add --[no-]src option
|
||||
* ds/scalar-updates (2023-08-28) 3 commits
|
||||
(merged to 'next' on 2023-08-28 at 093e6bcb9c)
|
||||
+ scalar reconfigure: help users remove buggy repos
|
||||
+ setup: add discover_git_directory_reason()
|
||||
+ scalar: add --[no-]src option
|
||||
|
||||
Scalar updates.
|
||||
source: <pull.1569.v2.git.1692725056.gitgitgadget@gmail.com>
|
||||
Will merge to 'master'.
|
||||
source: <pull.1569.v3.git.1693230746.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* jc/mv-d-to-d-error-message-fix (2023-08-11) 1 commit
|
||||
@ -534,19 +449,7 @@ Release tarballs are available at:
|
||||
source: <pull.1564.v2.git.1691702283.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* mh/credential-libsecret-attrs (2023-06-16) 1 commit
|
||||
(merged to 'next' on 2023-08-08 at dc73a2c55a)
|
||||
+ credential/libsecret: store new attributes
|
||||
|
||||
The way authentication related data other than passwords (e.g.
|
||||
oath token and password expiration data) are stored in libsecret
|
||||
keyrings has been rethought.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <pull.1469.v5.git.git.1686945306242.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* jc/rerere-cleanup (2023-08-03) 4 commits
|
||||
* 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
|
||||
@ -607,19 +510,6 @@ Release tarballs are available at:
|
||||
source: <48745298-f12b-8efb-4e48-90d2c22a8349@gmail.com>
|
||||
|
||||
|
||||
* mh/credential-erase-improvements-more (2023-07-26) 2 commits
|
||||
(merged to 'next' on 2023-08-08 at fd1ba4accf)
|
||||
+ credential/wincred: erase matching creds only
|
||||
+ credential/libsecret: erase matching creds only
|
||||
|
||||
Update two credential helpers to correctly match which credential
|
||||
to erase; they dropped not the ones with stale password.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <pull.1527.v2.git.git.1690387585634.gitgitgadget@gmail.com>
|
||||
source: <pull.1529.git.git.1687596777147.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* js/doc-unit-tests (2023-08-17) 3 commits
|
||||
- ci: run unit tests in CI
|
||||
- unit tests: add TAP unit test framework
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user