mirror of
https://github.com/git/git.git
synced 2026-04-02 04:50:12 +02:00
What's cooking (2023/08 #02)
This commit is contained in:
Junio C Hamano
@@ -1,10 +1,10 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Aug 2023, #01; Wed, 2)
|
||||
X-master-at: 1b0a5129563ebe720330fdc8f5c6843d27641137
|
||||
X-next-at: ed35a5117f890568bcd8290b0000b7550ab351b8
|
||||
Subject: What's cooking in git.git (Aug 2023, #02; Fri, 4)
|
||||
X-master-at: ac83bc5054c2ac489166072334b4147ce6d0fccb
|
||||
X-next-at: 6953b252045fa7a4c836b56ff7a46e3e85c8275b
|
||||
Bcc: lwn@lwn.net, gitster@pobox.com
|
||||
|
||||
What's cooking in git.git (Aug 2023, #01; Wed, 2)
|
||||
What's cooking in git.git (Aug 2023, #02; Fri, 4)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking in my tree. Commits
|
||||
@@ -17,14 +17,8 @@ topic without enough support may be discarded after a long period of
|
||||
no activity (of course they can be resubmit when new interests
|
||||
arise).
|
||||
|
||||
We are getting closer to the final phase of this cycle, which begins
|
||||
when -rc0 preview release is tagged this coming Friday, followed by
|
||||
about 1 1/2 weeks of stabilization period that begins when -rc1 is
|
||||
tagged (cf. tinyurl.com/gitCal). There are a handful of topics that
|
||||
still need reviews before getting merged to 'next', but because the
|
||||
summer in the northern hemisphere is historically a slower season,
|
||||
too few reviewers seem to be active, relative to the number of these
|
||||
topics.
|
||||
Git 2.42-rc0 has been tagged. Hopefully people can help find and
|
||||
fix plenty of regressions before we tag -rc1 mid next 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
|
||||
@@ -57,111 +51,191 @@ Release tarballs are available at:
|
||||
--------------------------------------------------
|
||||
[Graduated to 'master']
|
||||
|
||||
* ah/autoconf-fixes (2023-07-19) 3 commits
|
||||
(merged to 'next' on 2023-07-25 at 35ff66e0cb)
|
||||
+ configure.ac: always save NO_ICONV to config.status
|
||||
+ configure.ac: don't overwrite NO_CURL option
|
||||
+ configure.ac: don't overwrite NO_EXPAT option
|
||||
* hy/blame-in-bare-with-contents (2023-07-21) 1 commit
|
||||
(merged to 'next' on 2023-07-31 at 39ac96d8d8)
|
||||
+ blame: allow --contents to work with bare repo
|
||||
|
||||
"./configure --with-expat=no" did not work as a way to refuse use
|
||||
of the expat library on a system with the library installed, which
|
||||
has been corrected.
|
||||
source: <20230719145211.17854-2-aherrmann@suse.de>
|
||||
"git blame --contents=file" has been taught to work in a bare
|
||||
repository.
|
||||
source: <20230721035758.61956-1-hanyang.tony@bytedance.com>
|
||||
|
||||
|
||||
* ah/sequencer-rewrite-todo-fix (2023-07-24) 1 commit
|
||||
(merged to 'next' on 2023-07-26 at 24e74d9eda)
|
||||
+ sequencer: finish parsing the todo list despite an invalid first line
|
||||
* ja/worktree-orphan-fix (2023-07-26) 3 commits
|
||||
(merged to 'next' on 2023-07-27 at e475016065)
|
||||
+ t2400: rewrite regex to avoid unintentional PCRE
|
||||
+ builtin/worktree.c: convert tab in advice to space
|
||||
+ t2400: drop no-op `--sq` from rev-parse call
|
||||
|
||||
When the user edits "rebase -i" todo file so that it starts with a
|
||||
"fixup", which would make it invalid, the command truncated the
|
||||
rest of the file before giving an error and returning the control
|
||||
back to the user. Stop truncating to make it easier to correct
|
||||
such a malformed todo file.
|
||||
cf. <https://lore.kernel.org/git/0d1c5bfd-3ae5-83f0-a333-bbb8510a973a@gmail.com/>
|
||||
source: <20230722212830.132135-2-alexhenrie24@gmail.com>
|
||||
Fix tests with unportable regex patterns.
|
||||
source: <20230726214202.15775-1-jacobabel@nullpo.dev>
|
||||
|
||||
|
||||
* bb/use-trace2-counters-for-fsync-stats (2023-07-20) 1 commit
|
||||
(merged to 'next' on 2023-07-26 at f2c2e3f2b9)
|
||||
+ wrapper: use trace2 counters to collect fsync stats
|
||||
* jc/branch-in-use-error-message (2023-07-21) 1 commit
|
||||
(merged to 'next' on 2023-07-31 at 22f17d131b)
|
||||
+ branch: update the message to refuse touching a branch in-use
|
||||
|
||||
Instead of inventing a custom counter variables for debugging,
|
||||
use existing trace2 facility in the fsync customization codepath.
|
||||
source: <20230720164823.625815-1-dev+git@drbeat.li>
|
||||
"git branch -f X" to repoint the branch X said that X was "checked
|
||||
out" in another worktree, even when branch X was not and instead
|
||||
being bisected or rebased. The message was reworded to say the
|
||||
branch was "in use".
|
||||
source: <xmqqr0p1szhz.fsf_-_@gitster.g>
|
||||
|
||||
|
||||
* jc/tree-walk-drop-base-offset (2023-07-07) 2 commits
|
||||
(merged to 'next' on 2023-07-25 at cc050c60a6)
|
||||
+ tree-walk: drop unused base_offset from do_match()
|
||||
+ tree-walk: lose base_offset that is never used in tree_entry_interesting
|
||||
* jc/doc-sent-patch-now-what (2023-07-27) 1 commit
|
||||
(merged to 'next' on 2023-07-31 at 51f5d9d465)
|
||||
+ MyFirstContribution: refrain from self-iterating too much
|
||||
|
||||
Code simplification.
|
||||
source: <20230707222116.4129415-1-gitster@pobox.com>
|
||||
Process document update.
|
||||
source: <xmqqmszg987u.fsf_-_@gitster.g>
|
||||
|
||||
|
||||
* ks/ref-filter-describe (2023-07-24) 2 commits
|
||||
(merged to 'next' on 2023-07-26 at f4b3b3b7ef)
|
||||
+ ref-filter: add new "describe" atom
|
||||
+ ref-filter: add multiple-option parsing functions
|
||||
* jc/parse-options-short-help (2023-07-19) 3 commits
|
||||
(merged to 'next' on 2023-07-31 at e076d1f497)
|
||||
+ short help: allow a gap smaller than USAGE_GAP
|
||||
+ remote: simplify "remote add --tags" help text
|
||||
+ short help: allow multi-line opthelp
|
||||
|
||||
"git branch --list --format=<format>" and friends are taught
|
||||
a new "%(describe)" placeholder.
|
||||
source: <20230723162717.68123-1-five231003@gmail.com>
|
||||
Command line parser fix, and a small parse-options API update.
|
||||
source: <xmqq5y6gg8fn.fsf@gitster.g>
|
||||
|
||||
|
||||
* jc/retire-get-sha1-hex (2023-07-24) 1 commit
|
||||
(merged to 'next' on 2023-07-27 at eeb9cc37f5)
|
||||
+ hex: retire get_sha1_hex()
|
||||
|
||||
The implementation of "get_sha1_hex()" that reads a hexadecimal
|
||||
string that spells a full object name has been extended to cope
|
||||
with any hash function used in the repository, but the "sha1" in
|
||||
its name survived. Rename it to get_hash_hex(), a name that is
|
||||
more consistent within its friends like get_hash_hex_algop().
|
||||
source: <xmqq1qgwoqgo.fsf_-_@gitster.g>
|
||||
|
||||
|
||||
* la/doc-choose-starting-point (2023-07-14) 5 commits
|
||||
(merged to 'next' on 2023-07-19 at 5a807cae46)
|
||||
+ SubmittingPatches: simplify guidance for choosing a starting point
|
||||
+ SubmittingPatches: emphasize need to communicate non-default starting points
|
||||
+ SubmittingPatches: de-emphasize branches as starting points
|
||||
+ SubmittingPatches: discuss subsystems separately from git.git
|
||||
+ SubmittingPatches: reword awkward phrasing
|
||||
(this branch is used by la/doc-choose-starting-point-fixup.)
|
||||
|
||||
Clarify how to choose the starting point for a new topic in
|
||||
developer guidance document.
|
||||
|
||||
Will merge to 'master' together with the follow-on topic.
|
||||
source: <pull.1556.v2.git.1689314493.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* la/doc-choose-starting-point-fixup (2023-07-27) 3 commits
|
||||
(merged to 'next' on 2023-07-28 at 047dcae31c)
|
||||
+ SubmittingPatches: use of older maintenance tracks is an exception
|
||||
+ SubmittingPatches: explain why 'next' and above are inappropriate base
|
||||
+ SubmittingPatches: choice of base for fixing an older maintenance track
|
||||
(this branch uses la/doc-choose-starting-point.)
|
||||
|
||||
Clarify how to pick a starting point for a new topic in the
|
||||
SubmittingPatches document.
|
||||
|
||||
Will merge to 'master', together with the underlying topic.
|
||||
source: <pull.1556.v2.git.1689314493.gitgitgadget@gmail.com>
|
||||
source: <pull.1556.v3.git.1690340701.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* pv/doc-submodule-update-settings (2023-07-25) 1 commit
|
||||
(merged to 'next' on 2023-07-27 at e27b5b7ba8)
|
||||
+ doc: highlight that .gitmodules does not support !command
|
||||
|
||||
Rewrite the description of giving a custom command to the
|
||||
submodule.<name>.update configuration variable.
|
||||
source: <20230725212218.711116-1-pvutov@imap.cc>
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* bc/ident-dot-is-no-longer-crud-letter (2023-08-02) 1 commit
|
||||
- ident: don't consider '.' a crud
|
||||
* jc/rerere-cleanup (2023-08-03) 5 commits
|
||||
- rerere: plug small strbuf leak
|
||||
- rerere: modernize use of empty strbuf
|
||||
- rerere: try_merge() should use LL_MERGE_ERROR when it means an error
|
||||
- rerere: fix comment on handle_file() helper
|
||||
- rerere: simplify check_one_conflict() helper function
|
||||
(this branch uses jc/unresolve-removal.)
|
||||
|
||||
Exclude "." from the set of characters to be removed from the
|
||||
beginning and the end of the human-readable name.
|
||||
Code clean-up.
|
||||
|
||||
Will merge to 'next'?
|
||||
source: <xmqqsf918k4j.fsf@gitster.g>
|
||||
|
||||
|
||||
* jc/unresolve-removal (2023-07-31) 7 commits
|
||||
- checkout: allow "checkout -m path" to unmerge removed paths
|
||||
- checkout/restore: add basic tests for --merge
|
||||
- checkout/restore: refuse unmerging paths unless checking out of the index
|
||||
- update-index: remove stale fallback code for "--unresolve"
|
||||
- update-index: use unmerge_index_entry() to support removal
|
||||
- resolve-undo: allow resurrecting conflicted state that resolved to deletion
|
||||
- update-index: do not read HEAD and MERGE_HEAD unconditionally
|
||||
|
||||
"checkout --merge -- path" and "update-index --unresolve path" did
|
||||
not resurrect conflicted state that was resolved to remove path,
|
||||
but now they do.
|
||||
|
||||
Needs review.
|
||||
Not ready to be reviewed yet.
|
||||
source: <20230731224409.4181277-1-gitster@pobox.com>
|
||||
|
||||
|
||||
* ew/hash-with-openssl-evp (2023-08-01) 2 commits
|
||||
- avoid SHA-1 functions deprecated in OpenSSL 3+
|
||||
- sha256: avoid functions deprecated in OpenSSL 3+
|
||||
* ma/locate-in-path-for-windows (2023-08-04) 3 commits
|
||||
- docs: update when `git bisect visualize` uses `gitk`
|
||||
- compat/mingw: implement a native locate_in_PATH()
|
||||
- run-command: conditionally define locate_in_PATH()
|
||||
|
||||
Adjust to OpenSSL 3+, which deprecates its SHA-1 functions based on
|
||||
its traditional API, by using its EVP API instead.
|
||||
"git bisect visualize" stopped running "gitk" on Git for Windows
|
||||
when the command was reimplemented in C around Git 2.34 timeframe.
|
||||
This has been corrected.
|
||||
|
||||
Will merge to 'next'.
|
||||
source: <20230801025454.1137802-1-e@80x24.org>
|
||||
Will merge to 'next'.
|
||||
source: <pull.1560.v2.git.1691122124.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* rj/status-bisect-while-rebase (2023-08-01) 1 commit
|
||||
- status: fix branch shown when not only bisecting
|
||||
* pw/rebase-skip-commit-message-fix (2023-08-03) 1 commit
|
||||
- rebase --skip: fix commit message clean up when skipping squash
|
||||
|
||||
"git status" is taught to show both the branch being bisected and
|
||||
being rebased when both are in effect at the same time.
|
||||
"git rebase -i" with a series of squash/fixup, when one of the
|
||||
steps stopped in conflicts and ended up getting skipped, did not
|
||||
handle the accumulated commit log messages, which has been
|
||||
corrected.
|
||||
|
||||
Needs review.
|
||||
source: <48745298-f12b-8efb-4e48-90d2c22a8349@gmail.com>
|
||||
Will merge to 'next'.
|
||||
source: <pull.1558.git.git.1691068176051.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* bc/ignore-cland-cache (2023-08-04) 1 commit
|
||||
(merged to 'next' on 2023-08-04 at 5cf8d41911)
|
||||
+ gitignore: ignore clangd .cache directory
|
||||
|
||||
.gitignore update.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <20230804171328.1737188-1-sandals@crustytoothpaste.net>
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* mh/credential-libsecret-attrs (2023-06-16) 1 commit
|
||||
- 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.
|
||||
|
||||
Needs review.
|
||||
source: <pull.1469.v5.git.git.1686945306242.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* 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
|
||||
|
||||
@@ -187,19 +261,8 @@ Release tarballs are available at:
|
||||
Stalled for too long.
|
||||
source: <cover-v2-0.3-00000000000-20221230T011725Z-avarab@gmail.com>
|
||||
|
||||
|
||||
* ob/revert-of-revert (2023-05-05) 1 commit
|
||||
- sequencer: beautify subject of reverts of reverts
|
||||
|
||||
Instead of "Revert "Revert "original"", give "Reapply "original""
|
||||
as the title for a revert of a revert.
|
||||
|
||||
Will discard.
|
||||
Have been expecting a hopefully final reroll for too long.
|
||||
Looking much better, except for minor cosmetic issues.
|
||||
cf. <xmqqmt21txid.fsf@gitster.g>
|
||||
source: <20230428083528.1699221-1-oswald.buddenhagen@gmx.de>
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* pw/rebase-i-after-failure (2023-08-01) 7 commits
|
||||
- rebase -i: fix adding failed command to the todo list
|
||||
@@ -213,13 +276,63 @@ Release tarballs are available at:
|
||||
Various fixes to the behaviour of "rebase -i" when the command got
|
||||
interrupted by conflicting changes.
|
||||
|
||||
Will merge to 'next'?
|
||||
cf. <xmqqa5vad6ea.fsf@gitster.g>
|
||||
cf. <xmqq5y5yd6d7.fsf@gitster.g>
|
||||
Expecting a reroll.
|
||||
The latter half of the series should be reviewed by those who have
|
||||
more stake in the sequencer code than myself.
|
||||
cf. <619e458b-218b-a790-dfb4-9200e201b513@gmail.com>
|
||||
source: <pull.1492.v3.git.1690903412.gitgitgadget@gmail.com>
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* bc/ident-dot-is-no-longer-crud-letter (2023-08-02) 1 commit
|
||||
(merged to 'next' on 2023-08-03 at e786442a9b)
|
||||
+ ident: don't consider '.' a crud
|
||||
|
||||
Exclude "." from the set of characters to be removed from the
|
||||
beginning and the end of the human-readable name.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <xmqqsf918k4j.fsf@gitster.g>
|
||||
|
||||
|
||||
* jc/unresolve-removal (2023-07-31) 7 commits
|
||||
- checkout: allow "checkout -m path" to unmerge removed paths
|
||||
- checkout/restore: add basic tests for --merge
|
||||
- checkout/restore: refuse unmerging paths unless checking out of the index
|
||||
- update-index: remove stale fallback code for "--unresolve"
|
||||
- update-index: use unmerge_index_entry() to support removal
|
||||
- resolve-undo: allow resurrecting conflicted state that resolved to deletion
|
||||
- update-index: do not read HEAD and MERGE_HEAD unconditionally
|
||||
(this branch is used by jc/rerere-cleanup.)
|
||||
|
||||
"checkout --merge -- path" and "update-index --unresolve path" did
|
||||
not resurrect conflicted state that was resolved to remove path,
|
||||
but now they do.
|
||||
|
||||
Needs review.
|
||||
source: <20230731224409.4181277-1-gitster@pobox.com>
|
||||
|
||||
|
||||
* ew/hash-with-openssl-evp (2023-08-01) 2 commits
|
||||
(merged to 'next' on 2023-08-02 at 996db74865)
|
||||
+ avoid SHA-1 functions deprecated in OpenSSL 3+
|
||||
+ sha256: avoid functions deprecated in OpenSSL 3+
|
||||
|
||||
Adjust to OpenSSL 3+, which deprecates its SHA-1 functions based on
|
||||
its traditional API, by using its EVP API instead.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <20230801025454.1137802-1-e@80x24.org>
|
||||
|
||||
|
||||
* rj/status-bisect-while-rebase (2023-08-01) 1 commit
|
||||
- status: fix branch shown when not only bisecting
|
||||
|
||||
"git status" is taught to show both the branch being bisected and
|
||||
being rebased when both are in effect at the same time.
|
||||
|
||||
Needs review.
|
||||
source: <48745298-f12b-8efb-4e48-90d2c22a8349@gmail.com>
|
||||
|
||||
|
||||
* ew/sha256-gcrypt-leak-fixes (2023-07-31) 3 commits
|
||||
(merged to 'next' on 2023-08-01 at eed83801c3)
|
||||
@@ -243,32 +356,6 @@ Release tarballs are available at:
|
||||
source: <2dcb915f-b926-e024-6394-23aff200955c@web.de>
|
||||
|
||||
|
||||
* pv/doc-submodule-update-settings (2023-07-25) 1 commit
|
||||
(merged to 'next' on 2023-07-27 at e27b5b7ba8)
|
||||
+ doc: highlight that .gitmodules does not support !command
|
||||
|
||||
Rewrite the description of giving a custom command to the
|
||||
submodule.<name>.update configuraiton variable.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <20230725212218.711116-1-pvutov@imap.cc>
|
||||
|
||||
|
||||
* la/doc-choose-starting-point-fixup (2023-07-27) 3 commits
|
||||
(merged to 'next' on 2023-07-28 at 047dcae31c)
|
||||
+ SubmittingPatches: use of older maintenance tracks is an exception
|
||||
+ SubmittingPatches: explain why 'next' and above are inappropriate base
|
||||
+ SubmittingPatches: choice of base for fixing an older maintenance track
|
||||
(this branch uses la/doc-choose-starting-point.)
|
||||
|
||||
Clarify how to pick a starting point for a new topic in the
|
||||
SubmittingPatches document.
|
||||
|
||||
Will merge to 'master', together with the underlying topic.
|
||||
source: <pull.1556.v2.git.1689314493.gitgitgadget@gmail.com>
|
||||
source: <pull.1556.v3.git.1690340701.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* am/doc-sha256 (2023-07-31) 1 commit
|
||||
(merged to 'next' on 2023-08-01 at d7419bf527)
|
||||
+ doc: sha256 is no longer experimental
|
||||
@@ -283,43 +370,6 @@ Release tarballs are available at:
|
||||
source: <ZMe6KmzZGVubYpvO@adams>
|
||||
|
||||
|
||||
* hy/blame-in-bare-with-contents (2023-07-21) 1 commit
|
||||
(merged to 'next' on 2023-07-31 at 39ac96d8d8)
|
||||
+ blame: allow --contents to work with bare repo
|
||||
|
||||
"git blame --contents=file" has been taught to work in a bare
|
||||
repository.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <20230721035758.61956-1-hanyang.tony@bytedance.com>
|
||||
|
||||
|
||||
* ja/worktree-orphan-fix (2023-07-26) 3 commits
|
||||
(merged to 'next' on 2023-07-27 at e475016065)
|
||||
+ t2400: rewrite regex to avoid unintentional PCRE
|
||||
+ builtin/worktree.c: convert tab in advice to space
|
||||
+ t2400: drop no-op `--sq` from rev-parse call
|
||||
|
||||
Fix tests with unportable regex patterns.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <20230726214202.15775-1-jacobabel@nullpo.dev>
|
||||
|
||||
|
||||
* jc/retire-get-sha1-hex (2023-07-24) 1 commit
|
||||
(merged to 'next' on 2023-07-27 at eeb9cc37f5)
|
||||
+ hex: retire get_sha1_hex()
|
||||
|
||||
The implementation of "get_sha1_hex()" that reads a hexadecimal
|
||||
string that spells a full object name has been extended to cope
|
||||
with any hash function used in the repository, but the "sha1" in
|
||||
its name survived. Rename it to get_hash_hex(), a name that is
|
||||
more consistent within its friends like get_hash_hex_algop().
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <xmqq1qgwoqgo.fsf_-_@gitster.g>
|
||||
|
||||
|
||||
* rs/parse-options-negation-help (2023-07-24) 5 commits
|
||||
- parse-options: show negatability of options in short help
|
||||
- t1502: test option negation
|
||||
@@ -330,9 +380,11 @@ Release tarballs are available at:
|
||||
"git cmd -h" learned to signal which options can be negated by
|
||||
listing such options like "--[no-]opt".
|
||||
|
||||
Comments?
|
||||
Would showing "--[[no-]no-]opt" for "no-opt" be worth it?
|
||||
cf. <9e8225dd-1e8b-8af2-c3e1-0c5834694244@web.de>
|
||||
Will merge to 'next'.
|
||||
I personally liked a later suggestion to deal with "--[no-]no-foo"
|
||||
but that can be done as a separate enhancement.
|
||||
cf. <31b71333-de8b-d9a8-3ec4-1bad9cae2bf3@web.de>
|
||||
cf. <xmqqjzug14jo.fsf@gitster.g>
|
||||
source: <4d01e971-07cb-4f11-3cc6-9d9f21e590c1@web.de>
|
||||
|
||||
|
||||
@@ -350,44 +402,6 @@ Release tarballs are available at:
|
||||
source: <cover.1690216758.git.me@ttaylorr.com>
|
||||
|
||||
|
||||
* la/doc-choose-starting-point (2023-07-14) 5 commits
|
||||
(merged to 'next' on 2023-07-19 at 5a807cae46)
|
||||
+ SubmittingPatches: simplify guidance for choosing a starting point
|
||||
+ SubmittingPatches: emphasize need to communicate non-default starting points
|
||||
+ SubmittingPatches: de-emphasize branches as starting points
|
||||
+ SubmittingPatches: discuss subsystems separately from git.git
|
||||
+ SubmittingPatches: reword awkward phrasing
|
||||
(this branch is used by la/doc-choose-starting-point-fixup.)
|
||||
|
||||
Clarify how to choose the starting point for a new topic in
|
||||
developer guidance document.
|
||||
|
||||
Will merge to 'master' together with the follow-on topic.
|
||||
source: <pull.1556.v2.git.1689314493.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* jc/doc-sent-patch-now-what (2023-07-27) 1 commit
|
||||
(merged to 'next' on 2023-07-31 at 51f5d9d465)
|
||||
+ MyFirstContribution: refrain from self-iterating too much
|
||||
|
||||
Process document update.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <xmqqmszg987u.fsf_-_@gitster.g>
|
||||
|
||||
|
||||
* jc/parse-options-short-help (2023-07-19) 3 commits
|
||||
(merged to 'next' on 2023-07-31 at e076d1f497)
|
||||
+ short help: allow a gap smaller than USAGE_GAP
|
||||
+ remote: simplify "remote add --tags" help text
|
||||
+ short help: allow multi-line opthelp
|
||||
|
||||
Command line parser fix, and a small parse-options API update.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <xmqq5y6gg8fn.fsf@gitster.g>
|
||||
|
||||
|
||||
* sl/sparse-check-attr (2023-07-18) 3 commits
|
||||
- check-attr: integrate with sparse-index
|
||||
- attr.c: read attributes in a sparse directory
|
||||
@@ -401,19 +415,6 @@ Release tarballs are available at:
|
||||
source: <20230718232916.31660-1-cheskaqiqi@gmail.com>
|
||||
|
||||
|
||||
* jc/branch-in-use-error-message (2023-07-21) 1 commit
|
||||
(merged to 'next' on 2023-07-31 at 22f17d131b)
|
||||
+ branch: update the message to refuse touching a branch in-use
|
||||
|
||||
"git branch -f X" to repoint the branch X seid that X was "checked
|
||||
out" in another worktree, even when branch X was not and instead
|
||||
being bisected or rebased. The message was reworded to say the
|
||||
branch was "in use".
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <xmqqr0p1szhz.fsf_-_@gitster.g>
|
||||
|
||||
|
||||
* mh/credential-erase-improvements-more (2023-07-26) 2 commits
|
||||
- credential/wincred: erase matching creds only
|
||||
- credential/libsecret: erase matching creds only
|
||||
@@ -454,140 +455,19 @@ Release tarballs are available at:
|
||||
|
||||
|
||||
* jt/path-filter-fix (2023-08-01) 7 commits
|
||||
- commit-graph: new filter ver. that fixes murmur3
|
||||
- repo-settings: introduce commitgraph.changedPathsVersion
|
||||
- t4216: test changed path filters with high bit paths
|
||||
- t/helper/test-read-graph: implement `bloom-filters` mode
|
||||
- bloom.h: make `load_bloom_filter_from_graph()` public
|
||||
- t/helper/test-read-graph.c: extract `dump_graph_info()`
|
||||
- gitformat-commit-graph: describe version 2 of BDAT
|
||||
(merged to 'next' on 2023-08-03 at d99958c287)
|
||||
+ commit-graph: new filter ver. that fixes murmur3
|
||||
+ repo-settings: introduce commitgraph.changedPathsVersion
|
||||
+ t4216: test changed path filters with high bit paths
|
||||
+ t/helper/test-read-graph: implement `bloom-filters` mode
|
||||
+ bloom.h: make `load_bloom_filter_from_graph()` public
|
||||
+ t/helper/test-read-graph.c: extract `dump_graph_info()`
|
||||
+ gitformat-commit-graph: describe version 2 of BDAT
|
||||
|
||||
The Bloom filter used for path limited history traversal was broken
|
||||
on systems whose "char" is unsigned; update the implementation and
|
||||
bump the format version to 2.
|
||||
|
||||
Still under discussion.
|
||||
cf. <20230801185232.1457172-1-jonathantanmy@google.com>
|
||||
Will merge to 'master'.
|
||||
cf. <ZMqp6K2iXixWH/zT@nand.local>
|
||||
source: <cover.1690912539.git.jonathantanmy@google.com>
|
||||
|
||||
|
||||
* mh/credential-libsecret-attrs (2023-06-16) 1 commit
|
||||
- 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.
|
||||
|
||||
Needs review.
|
||||
source: <pull.1469.v5.git.git.1686945306242.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* 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
|
||||
|
||||
What's the status of this thing?
|
||||
source: <20230602102533.876905-1-christian.couder@gmail.com>
|
||||
|
||||
--------------------------------------------------
|
||||
[Discarded]
|
||||
|
||||
* jc/doc-submodule-update-settings (2023-07-13) 1 commit
|
||||
. submodule: clarify that "!custom command" is the only oddball
|
||||
|
||||
Rewrite the description of giving a custom command to the
|
||||
submodule.<name>.update configuraiton variable.
|
||||
|
||||
Superseded by pv/doc-submodule-update-settings topic.
|
||||
source: <xmqqwmz3oacg.fsf@gitster.g>
|
||||
|
||||
|
||||
* jc/rerere-read-rr-fix (2023-07-21) 1 commit
|
||||
. rerere: match the hash algorithm with its length
|
||||
|
||||
SHA-256 fix.
|
||||
|
||||
Superseded by jc/retire-get-sha1-hex
|
||||
source: <xmqqa5vou9ar.fsf@gitster.g>
|
||||
|
||||
|
||||
* cb/checkout-same-branch-twice (2023-03-22) 2 commits
|
||||
. SQUASH??? the test marked to expect failure passes from day one
|
||||
. checkout/switch: disallow checking out same branch in multiple worktrees
|
||||
|
||||
"git checkout -B $branch" failed to protect against checking out
|
||||
a branch that is checked out elsewhere, unlike "git branch -f" did.
|
||||
|
||||
Have been expecting a hopefully minor and final reroll for too long.
|
||||
cf. <CAPUEspj_Bh+LgYLnWfeBdcq_uV5Cbou-7H51GLFjzSa5Qzby9w@mail.gmail.com>
|
||||
source: <20230120113553.24655-1-carenas@gmail.com>
|
||||
|
||||
|
||||
* ed/fsmonitor-windows-named-pipe (2023-03-24) 1 commit
|
||||
. fsmonitor: handle differences between Windows named pipe functions
|
||||
|
||||
Fix fsmonitor on Windows when the filesystem path contains certain
|
||||
characters.
|
||||
|
||||
Have been expecting a reroll for too long.
|
||||
cf. <b9cf67e4-22a7-2ff0-8310-9223bea10d6d@jeffhostetler.com>
|
||||
source: <pull.1503.git.1679678090412.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* rn/sparse-diff-index (2023-04-10) 1 commit
|
||||
. diff-index: enable sparse index
|
||||
|
||||
"git diff-index" command has been taught to work better with the
|
||||
sparse index.
|
||||
|
||||
Have been expecting a reroll for too long.
|
||||
cf. <62821012-4fc3-5ad8-695c-70f7ab14a8c9@github.com>
|
||||
source: <20230408112342.404318-1-nanth.raghul@gmail.com>
|
||||
|
||||
|
||||
* es/recurse-submodules-option-is-a-bool (2023-04-10) 1 commit
|
||||
. usage: clarify --recurse-submodules as a boolean
|
||||
|
||||
The "--[no-]recurse-submodules" option of "git checkout" and others
|
||||
supported an undocumented syntax --recurse-submodules=<value> where
|
||||
the value can spell a Boolean in various ways. The support for the
|
||||
syntax is being dropped.
|
||||
|
||||
Have been expecting a reroll for too long.
|
||||
cf. <ZDSTFwMFO7vbj/du@google.com>
|
||||
source: <ZDSTFwMFO7vbj/du@google.com>
|
||||
|
||||
|
||||
* jc/checkout-merge-fix (2023-07-28) 2 commits
|
||||
. checkout/restore: add basic tests for --merge
|
||||
. checkout/restore: refuse unmerging paths unless checking out of the index
|
||||
|
||||
"git checkout/restore --merge -- $path" improvements.
|
||||
|
||||
Superseded by jc/unresolve-removal
|
||||
source: <xmqq7cqj4rme.fsf@gitster.g>
|
||||
|
||||
|
||||
* jc/resolve-undo-fixes (2023-07-28) 4 commits
|
||||
. update-index: remove stale fallback code for "--unresolve"
|
||||
. update-index: use unmerge_index_entry() to support removal
|
||||
. resolve-undo: allow resurrecting conflicted state that resolved to deletion
|
||||
. update-index: do not read HEAD and MERGE_HEAD unconditionally
|
||||
|
||||
Assorted fixes and clean-up around resolve-undo data.
|
||||
|
||||
Superseded by jc/unresolve-removal
|
||||
source: <xmqqo7jv4y0t.fsf_-_@gitster.g>
|
||||
|
||||
Reference in New Issue
Block a user