Skip to contentSkip to conversation

What's cooking in git.git (Sep 2023, #05; Fri, 15)

DISCUSSION Junio C Hamano 4 participants 10 messages Sep 16, 2023 – Sep 25, 2023

lore
Share & tools
lore
#0 lore raw

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-vcs/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/

--------------------------------------------------
[Graduated to 'master']

* ak/pretty-decorate-more (2023-08-21) 8 commits (merged to 'next' on 2023-09-07 at 6f5e14cef2)
+ decorate: use commit color for HEAD arrow
+ pretty: add pointer and tag options to %(decorate)
+ pretty: add %(decorate[:<options>]) format
+ decorate: color each token separately
+ decorate: avoid some unnecessary color overhead
+ decorate: refactor format_decorations()
+ pretty-formats: enclose options in angle brackets
+ pretty-formats: define "literal formatting code"

"git log --format" has been taught the %(decorate) placeholder.
source: <[email protected]>

* bc/more-git-var (2023-09-05) 1 commit (merged to 'next' on 2023-09-06 at d8af32874c)
+ var: avoid a segmentation fault when HOME is unset

Fix-up for a topic that already has graduated.
source: <[email protected]>

* ew/hash-with-openssl-evp (2023-08-31) 1 commit (merged to 'next' on 2023-09-05 at 1ddc0078c8)
+ treewide: fix various bugs w/ OpenSSL 3+ EVP API

Fix-up new-ish code to support OpenSSL EVP API.
source: <20230901020928.M610756@dcvr>

* jk/tree-name-and-depth-limit (2023-08-31) 10 commits (merged to 'next' on 2023-09-07 at 7ad767ab0d)
+ lower core.maxTreeDepth default to 2048
+ tree-diff: respect max_allowed_tree_depth
+ list-objects: respect max_allowed_tree_depth
+ read_tree(): respect max_allowed_tree_depth
+ traverse_trees(): respect max_allowed_tree_depth
+ add core.maxTreeDepth config
+ fsck: detect very large tree pathnames
+ tree-walk: rename "error" variable
+ tree-walk: drop MAX_TRAVERSE_TREES macro
+ tree-walk: reduce stack size for recursive functions

We now limit depth of the tree objects and maximum length of pathnames recorded in tree objects.
source: <[email protected]>

* jk/unused-post-2.42-part2 (2023-09-05) 10 commits
(merged to 'next' on 2023-09-05 at 308ca3a052)
+ parse-options: mark unused parameters in noop callback
+ interpret-trailers: mark unused "unset" parameters in option callbacks
+ parse-options: add more BUG_ON() annotations
+ merge: do not pass unused opt->value parameter
+ parse-options: mark unused "opt" parameter in callbacks
+ parse-options: prefer opt->value to globals in callbacks
+ checkout-index: delay automatic setting of to_tempfile
+ format-patch: use OPT_STRING_LIST for to/cc options
+ merge: simplify parsing of "-n" option
+ merge: make xopts a strvec

Unused parameters to functions are marked as such, and/or removed, in order to bring us closer to -Wunused-parameter clean.
source: <[email protected]>

* ks/ref-filter-sort-numerically (2023-09-05) 1 commit (merged to 'next' on 2023-09-06 at aa4d156366)
+ ref-filter: sort numerically when ":size" is used

"git for-each-ref --sort='contents:size'" sorts the refs according to size numerically, giving a ref that points at a blob twelve-byte
(12) long before showing a blob hundred-byte (100) long.
source: <[email protected]>

* ob/revert-of-revert-is-reapply (2023-09-02) 2 commits (merged to 'next' on 2023-09-07 at 9a54f66511)
+ git-revert.txt: add discussion
+ sequencer: beautify subject of reverts of reverts

The default log message created by "git revert", when reverting a commit that records a revert, has been tweaked.
source: <[email protected]>
source: <[email protected]>

* ob/sequencer-reword-error-message (2023-09-05) 1 commit (merged to 'next' on 2023-09-06 at c5154b7aa2)
+ sequencer: fix error message on failure to copy SQUASH_MSG

Update an error message (which would probably never been seen).
source: <[email protected]>

* pw/rebase-i-after-failure (2023-09-06) 7 commits (merged to 'next' on 2023-09-07 at 3cbc3c4d63)
+ rebase -i: fix adding failed command to the todo list
+ rebase --continue: refuse to commit after failed command
+ rebase: fix rewritten list for failed pick
+ sequencer: factor out part of pick_commits()
+ sequencer: use rebase_path_message()
+ rebase -i: remove patch file after conflict resolution
+ rebase -i: move unlink() calls

Various fixes to the behaviour of "rebase -i" when the command got interrupted by conflicting changes.
cf. <[email protected]>
source: <[email protected]>

* rs/grep-parseopt-simplify (2023-09-05) 1 commit
(merged to 'next' on 2023-09-06 at 249b69cfd2)
+ grep: use OPT_INTEGER_F for --max-depth

Simplify use of parse-options API a bit.
source: <[email protected]>

* rs/name-rev-use-opt-hidden-bool (2023-09-05) 1 commit (merged to 'next' on 2023-09-06 at 9b251a5392)
+ name-rev: use OPT_HIDDEN_BOOL for --peel-tag

Simplify use of parse-options API a bit.
source: <[email protected]>

* so/diff-doc-for-patch-update (2023-09-06) 1 commit (merged to 'next' on 2023-09-07 at 6da5e9defd)
+ doc/diff-options: fix link to generating patch section

References from description of the --patch option in various manual pages have been simplified and improved.
source: <[email protected]>

--------------------------------------------------
[New Topics]

* ob/sequencer-remove-dead-code (2023-09-12) 1 commit (merged to 'next' on 2023-09-13 at 1f6c2b336b)
+ sequencer: remove unreachable exit condition in pick_commits()

Code clean-up.

Will merge to 'master'.
source: <[email protected]>

* ob/t3404-typofix (2023-09-12) 1 commit
(merged to 'next' on 2023-09-13 at b17fa78c3f)
+ t3404-rebase-interactive.sh: fix typos in title of a rewording test

Code clean-up.

Will merge to 'master'.
source: <[email protected]>

* jk/ort-unused-parameter-cleanups (2023-09-14) 4 commits
- merge-ort: drop unused "opt" parameter from merge_check_renames_reusable()
- merge-ort: drop unused parameters from detect_and_process_renames()
- merge-ort: stop passing "opt" to read_oid_strbuf()
- merge-ort: drop custom err() function

Code clean-up.

Needs review.
source: <[email protected]>

* jc/fake-lstat (2023-09-14) 1 commit
- cache: add fake_lstat()

A new helper to let us pretend that we called lstat() when we know our cache_entry is up-to-date via fsmonitor.

Needs review.
source: <[email protected]>

* jk/redact-h2h3-headers-fix (2023-09-15) 2 commits
- http: update curl http/2 info matching for curl 8.3.0
- http: factor out matching of curl http/2 trace lines

HTTP Header redaction code has been adjusted for a newer version of cURL library that shows its traces differently from earlier versions.

Will merge to 'next'.
source: <[email protected]>

* ch/clean-docfix (2023-09-15) 1 commit
- git-clean doc: fix "without do cleaning" typo

Typofix.

Will merge to 'next'.
source: <[email protected]>

* eg/config-type-path-docfix (2023-09-15) 1 commit
- git-config: fix misworded --type=path explanation

Typofix.

Will merge to 'next'.
source: <[email protected]>

* kn/rev-list-ignore-missing-links (2023-09-15) 1 commit
- revision: add --ignore-missing-links user option

Surface the .ignore_missing_links bit that stops the revision traversal from stopping and dying when encountering a missing object to a new command line option of "git rev-list", so that the objects that are required but are missing can be enumerated.

Waiting for review response.
source: <[email protected]>

--------------------------------------------------
[Stalled]

* 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. <[email protected]>
source: <[email protected]>

--------------------------------------------------
[Cooking]

* js/systemd-timers-wsl-fix (2023-09-11) 1 commit (merged to 'next' on 2023-09-12 at 71c4cbb1df)
+ maintenance(systemd): support the Windows Subsystem for Linux

Update "git maintainance" timers' implementation based on systemd timers to work with WSL.

Will merge to 'master'.
source: <[email protected]>

* kh/range-diff-notes (2023-09-11) 1 commit
- range-diff: treat notes like log

"git range-diff --notes=foo" compared "log --notes=foo --notes" of the two ranges, instead of using just the specified notes tree.

Expecting a reroll.
cf. <[email protected]>
source: <a37dfb3748e23b4f5081bc9a3c80a5c546101f1d.1694383248.git.code@khaugsbakk.name>

* pw/diff-no-index-from-named-pipes (2023-09-11) 1 commit (merged to 'next' on 2023-09-12 at 135ecd136f)
+ diff --no-index: fix -R with stdin

"git diff --no-index -R <(one) <(two)" did not work correctly, which has been corrected.

Will merge to 'master'.
source: <[email protected]>

* rs/parse-options-value-int (2023-09-11) 2 commits
- parse-options: use and require int pointer for OPT_CMDMODE
- parse-options: add int value pointer to struct option

A bit of type safety for the "value" pointer used in the parse-options API.

What's the status of this one?
source: <[email protected]>

* so/diff-merges-d (2023-09-11) 2 commits
- diff-merges: introduce '-d' option
- diff-merges: improve --diff-merges documentation

Teach a new "-d" option that shows the patch against the first parent for merge commits (which is "--diff-merges=first-parent -p").

Needs more work.
source: <[email protected]>

* js/diff-cached-fsmonitor-fix (2023-09-11) 1 commit (merged to 'next' on 2023-09-12 at 7479278da0)
+ diff-lib: fix check_removed when fsmonitor is on

"git diff --cached" codepath did not fill the necessary stat information for a file when fsmonitor knows it is clean and ended up behaving as if it is not clean, which has been corrected.

Will merge to 'master'.
source: <[email protected]>

* pb/completion-aliases-doc (2023-09-12) 1 commit
(merged to 'next' on 2023-09-13 at b248a5bc26)
+ completion: improve doc for complex aliases

Clarify how "alias.foo = : git cmd ; aliased-command-string" should be spelled with necessary whitespaces around punctuation marks to work.

Will merge to 'master'.
source: <[email protected]>

* cc/repack-sift-filtered-objects-to-separate-pack (2023-09-11) 9 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
. pack-bitmap-write: rebuild using new bitmap when remapping . 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.

May need to wait until tb/repack-existing-packs-cleanup stablizes.
source: <[email protected]>

* la/trailer-cleanups (2023-09-11) 6 commits
(merged to 'next' on 2023-09-12 at 779c4a097a)
+ trailer: use offsets for trailer_start/trailer_end
+ trailer: rename *_DEFAULT enums to *_UNSPECIFIED
+ trailer: teach find_patch_start about --no-divider
+ trailer: split process_command_line_args into separate functions
+ trailer: split process_input_file into separate pieces
+ trailer: separate public from internal portion of trailer_iterator

Code clean-up.

Will merge to 'master'.
source: <[email protected]>

* tb/repack-existing-packs-cleanup (2023-09-13) 8 commits (merged to 'next' on 2023-09-14 at bb8065e89c)
+ builtin/repack.c: extract common cruft pack loop
+ builtin/repack.c: avoid directly inspecting "util"
+ builtin/repack.c: store existing cruft packs separately
+ builtin/repack.c: extract has_existing_non_kept_packs()
+ builtin/repack.c: extract redundant pack cleanup for existing packs
+ builtin/repack.c: extract redundant pack cleanup for --geometric
+ builtin/repack.c: extract marking packs for deletion
+ builtin/repack.c: extract structure to store existing packs

The code to keep track of existing packs in the repository while repacking has been refactored.

Will merge to 'master'.
source: <[email protected]>

* pb/complete-commit-trailers (2023-09-12) 2 commits (merged to 'next' on 2023-09-13 at 9a0ec17606)
+ completion: commit: complete trailers tokens more robustly (merged to 'next' on 2023-09-08 at 842587016d)
+ completion: commit: complete configured trailer tokens

The command-line complation support (in contrib/) learned to complete "git commit --trailer=" for possible trailer keys.

Will merge to 'master'.
source: <[email protected]>

* pw/rebase-sigint (2023-09-07) 1 commit
- rebase -i: ignore signals when forking subprocesses

If the commit log editor or other external programs (spawned via "exec" insn in the todo list) receive internactive signal during "git rebase -i", it caused not just the spawned program but the "Git" process that spawned them, which is often not what the end user intended. "git" learned to ignore SIGINT and SIGQUIT while waiting for these subprocesses.

Expecting a reroll.
cf. <[email protected]>
source: <[email protected]>

* rs/grep-no-no-or (2023-09-07) 1 commit
(merged to 'next' on 2023-09-08 at 33849032bc)
+ grep: reject --no-or

"git grep -e A --no-or -e B" is accepted, even though the negation of "or" did not mean anything, which has been tightened.

Will merge to 'master'.
source: <[email protected]>

* js/complete-checkout-t (2023-09-08) 1 commit (merged to 'next' on 2023-09-08 at 461bb28fbd)
+ completion(switch/checkout): treat --track and -t the same

The completion script (in contrib/) has been taught to treat the "-t" option to "git checkout" and "git switch" just like the "--track" option, to complete remote-tracking branches.

Will merge to 'master'.
source: <[email protected]>

* cw/git-std-lib (2023-09-11) 7 commits
- SQUASH???
- git-std-lib: add test file to call git-std-lib.a functions
- git-std-lib: introduce git standard library
- parse: create new library for parsing strings and env values
- config: correct bad boolean env value error message
- wrapper: remove dependency to Git-specific internal file
- hex-ll: split out functionality from hex

Another libification effort.

Needs more work.
cf. <[email protected]>
cf. <[email protected]>
source: <[email protected]>

* cc/git-replay (2023-09-07) 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

Waiting for review response.
cf. <[email protected]>
cf. <[email protected]>
cf. <[email protected]>
May want to wait until tb/repack-existing-packs-cleanup stabilizes.
source: <[email protected]>

* la/trailer-test-and-doc-updates (2023-09-07) 13 commits
- trailer doc: <token> is a <key> or <keyAlias>, not both
- trailer doc: separator within key suppresses default separator
- trailer doc: emphasize the effect of configuration variables
- trailer --unfold help: prefer "reformat" over "join"
- trailer --parse docs: add explanation for its usefulness
- trailer --only-input: prefer "configuration variables" over "rules"
- trailer --parse help: expose aliased options
- trailer --no-divider help: describe usual "---" meaning
- trailer: trailer location is a place, not an action
- trailer doc: narrow down scope of --where and related flags
- trailer: add tests to check defaulting behavior with --no-* flags
- trailer test description: this tests --where=after, not --where=before
- trailer tests: make test cases self-contained

Test coverage for trailers has been improved.
source: <[email protected]>

* js/doc-unit-tests (2023-08-17) 3 commits
- ci: run unit tests in CI
- unit tests: add TAP unit test framework
- unit tests: Add a project plan document (this branch is used by js/doc-unit-tests-with-cmake.)

Process to add some form of low-level unit tests has started.

Waiting for review response.
cf. <[email protected]>
source: <[email protected]>

* js/doc-unit-tests-with-cmake (2023-08-31) 4 commits
- artifacts-tar: when including .dll files, don't forget the unit-tests
- unit-tests: do show relative file paths
- unit-tests: do not mistake .pdb files for being executable
- cmake: also build unit tests
(this branch uses js/doc-unit-tests.)

Update the base topic to work with CMake builds.

Waiting for the base topic to settle.
source: <[email protected]>

* tb/path-filter-fix (2023-08-30) 15 commits
- bloom: introduce deinit_bloom_filters()
- commit-graph: reuse existing Bloom filters where possible
- object.h: fix mis-aligned flag bits table
- commit-graph: drop unnecessary graph_read_bloom_data_context
- commit-graph.c: unconditionally load Bloom filters
- t/t4216-log-bloom.sh: harden test_bloom_filters_not_used()
- bloom: prepare to discard incompatible Bloom filters
- bloom: annotate filters with hash version
- 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.

Needs more work.
cf. <[email protected]>
source: <[email protected]>

* js/config-parse (2023-08-23) 4 commits
- config-parse: split library out of config.[c|h]
- config.c: accept config_parse_options in git_config_from_stdin
- config: report config parse errors using cb
- config: split out config_parse_options

The parsing routines for the configuration files have been split into a separate file.

Needs review.
source: <[email protected]>

* jc/update-index-show-index-version (2023-09-12) 3 commits (merged to 'next' on 2023-09-13 at b754554df8)
+ test-tool: retire "index-version"
+ update-index: add --show-index-version
+ update-index doc: v4 is OK with JGit and libgit2

"git update-index" learns "--show-index-version" to inspect the index format version used by the on-disk index file.

Will merge to 'master'.
source: <[email protected]>

* 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 (this branch uses jc/unresolve-removal.)

Code clean-up.

Not ready to be reviewed yet.
source: <[email protected]>

* 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: <[email protected]>

* 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.
cf. <[email protected]>
source: <[email protected]>

#1 lore raw
Quoted 11 lines · Junio C Hamano

* tb/repack-existing-packs-cleanup (2023-09-13) 8 commits (merged to 'next' on 2023-09-14 at bb8065e89c)
+ builtin/repack.c: extract common cruft pack loop
+ builtin/repack.c: avoid directly inspecting "util"
+ builtin/repack.c: store existing cruft packs separately
+ builtin/repack.c: extract has_existing_non_kept_packs()
+ builtin/repack.c: extract redundant pack cleanup for existing packs
+ builtin/repack.c: extract redundant pack cleanup for --geometric
+ builtin/repack.c: extract marking packs for deletion
+ builtin/repack.c: extract structure to store existing packs

Quoted 5 lines

The code to keep track of existing packs in the repository while repacking has been refactored.

Will merge to 'master'.
source: <[email protected]>

Nice, I'm happy to see that this is moving along. Thanks, everybody, for participating in the review :-). It's very nice to have a second set of eyes when touching the repack machinery.

Quoted 11 lines

* cc/repack-sift-filtered-objects-to-separate-pack (2023-09-11) 9 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
. pack-bitmap-write: rebuild using new bitmap when remapping . repack: refactor finding pack prefix
. repack: refactor finishing pack-objects command
. t/helper: add 'find-pack' test-tool
. pack-objects: allow --filter without --stdout

Quoted 5 lines

"git repack" machinery learns to pay attention to the "--filter=" option.

May need to wait until tb/repack-existing-packs-cleanup stablizes.
source: <[email protected]>

I sent Christian a draft of what I think the conflict resolution should look like when rebasing on top of tb/repack-existing-packs-cleanup [1].

I've looked over all but one of the previous rounds, and have seen the most recent round and am happy with the result. So I think that this could go in relatively quickly following merging the above.

I have a couple of other repacking-related topics that are in my queue, but I've been holding off on sending them until Christian's series has stabilized. They are:

- tb/cruft-max-size ([email protected]:ttaylorr/git.git)
- tb/cruft-preferred-inference ([email protected]:ttaylorr/git.git)

The former is on the list at [2], and needs a bit of work before queueing again. The latter isn't on the list, but fixes a performance bug where it is possible in rare circumstances to select the cruft pack as preferred when generating a MIDX bitmap during repacking.

The second isn't crucial to get in any time soon, but I would love to get it off of my queue before we start cutting pre-releases. At this rate, I doubt it will be a problem.

[1]: https://lore.kernel.org/git/[email protected]/
[2]: https://lore.kernel.org/git/[email protected]/

Quoted 17 lines

* tb/path-filter-fix (2023-08-30) 15 commits
- bloom: introduce deinit_bloom_filters()
- commit-graph: reuse existing Bloom filters where possible
- object.h: fix mis-aligned flag bits table
- commit-graph: drop unnecessary graph_read_bloom_data_context
- commit-graph.c: unconditionally load Bloom filters
- t/t4216-log-bloom.sh: harden test_bloom_filters_not_used()
- bloom: prepare to discard incompatible Bloom filters
- bloom: annotate filters with hash version
- 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

Quoted 7 lines

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.

Needs more work.
cf. <[email protected]>
source: <[email protected]>

I think that Jonathan's most recent round of this is ready to get merged up, cf. [3]. The outstanding issue you note in <[email protected]> can be addressed separately, I believe. To that end, I have a RFC-level patch proposed here [4].

[3]: https://lore.kernel.org/git/[email protected]/
[4]: https://lore.kernel.org/git/ZQnmTXUO94%[email protected]/

Thanks,
Taylor

#2 lore raw
Quoted 21 lines · Taylor Blau
Quoted 21 lines

* tb/path-filter-fix (2023-08-30) 15 commits
- bloom: introduce deinit_bloom_filters()
- commit-graph: reuse existing Bloom filters where possible
- object.h: fix mis-aligned flag bits table
- commit-graph: drop unnecessary graph_read_bloom_data_context
- commit-graph.c: unconditionally load Bloom filters
- t/t4216-log-bloom.sh: harden test_bloom_filters_not_used()
- bloom: prepare to discard incompatible Bloom filters
- bloom: annotate filters with hash version
- 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.

Quoted 8 lines
Quoted 3 lines

Needs more work.
cf. <[email protected]>
source: <[email protected]>

I think that Jonathan's most recent round of this is ready to get merged up, cf. [3]. The outstanding issue you note in <[email protected]> can be addressed separately, I believe. To that end, I have a RFC-level patch proposed here [4].

Besides the issue of not reading Bloom filter for root commits, that message of mine also includes a test demonstrating that handling split commit graph with layers containing different versions of Bloom filters is broken. That test still fails with the current version of this patch series, i.e. what is currently in seen. Jonathan provided a patch that makes that test pass, and also noted that that test did pass with his original design:

https://public-inbox.org/git/[email protected]/

I maintain that without test cases thoroughly covering the interaction of different Bloom filter versions with split commit graphs this series should not be merged.

Quoted 5 lines

[3]: https://lore.kernel.org/git/[email protected]/
[4]: https://lore.kernel.org/git/ZQnmTXUO94%[email protected]/

Thanks,
Taylor

#3 lore raw
Quoted 9 lines · SZEDER Gábor

Besides the issue of not reading Bloom filter for root commits, that message of mine also includes a test demonstrating that handling split commit graph with layers containing different versions of Bloom filters is broken. That test still fails with the current version of this patch series, i.e. what is currently in seen. Jonathan provided a patch that makes that test pass, and also noted that that test did pass with his original design:

https://public-inbox.org/git/[email protected]/

I am not sure whether you are pointing out an existing breakage which remains unfixed, or pointing out a new bug introduced by this series. I think that it is the former, but I wrote up some of my confusion in:

https://lore.kernel.org/git/[email protected]/

Quoted 3 lines

I maintain that without test cases thoroughly covering the interaction of different Bloom filter versions with split commit graphs this series should not be merged.

Agreed. We should wait for the discussion in the linked thread to settle before merging this down.

Thanks,
Taylor

#4 lore raw
In reply to Junio C Hamano
Quoted 13 lines · Junio C Hamano

[Cooking]

[...]

* la/trailer-cleanups (2023-09-11) 6 commits
(merged to 'next' on 2023-09-12 at 779c4a097a)
+ trailer: use offsets for trailer_start/trailer_end
+ trailer: rename *_DEFAULT enums to *_UNSPECIFIED
+ trailer: teach find_patch_start about --no-divider
+ trailer: split process_command_line_args into separate functions
+ trailer: split process_input_file into separate pieces
+ trailer: separate public from internal portion of trailer_iterator

Quoted 4 lines

Code clean-up.

Will merge to 'master'.
source: <[email protected]>

This isn't ready yet (still need to reroll).

Quoted 17 lines

[...]

* la/trailer-test-and-doc-updates (2023-09-07) 13 commits
- trailer doc: <token> is a <key> or <keyAlias>, not both
- trailer doc: separator within key suppresses default separator
- trailer doc: emphasize the effect of configuration variables
- trailer --unfold help: prefer "reformat" over "join"
- trailer --parse docs: add explanation for its usefulness
- trailer --only-input: prefer "configuration variables" over "rules"
- trailer --parse help: expose aliased options
- trailer --no-divider help: describe usual "---" meaning
- trailer: trailer location is a place, not an action
- trailer doc: narrow down scope of --where and related flags
- trailer: add tests to check defaulting behavior with --no-* flags
- trailer test description: this tests --where=after, not --where=before
- trailer tests: make test cases self-contained

Quoted 2 lines

Test coverage for trailers has been improved.
source: <[email protected]>

Did you forget to add "Need more reviews"? Not sure what the status is for the overall series (modulo your targetd comments for some of the patches).

#5 lore raw
Quoted 39 lines · Linus Arver
Quoted 13 lines · Junio C Hamano

[Cooking]

[...]

* la/trailer-cleanups (2023-09-11) 6 commits
(merged to 'next' on 2023-09-12 at 779c4a097a)
+ trailer: use offsets for trailer_start/trailer_end
+ trailer: rename *_DEFAULT enums to *_UNSPECIFIED
+ trailer: teach find_patch_start about --no-divider
+ trailer: split process_command_line_args into separate functions
+ trailer: split process_input_file into separate pieces
+ trailer: separate public from internal portion of trailer_iterator

Quoted 4 lines

Code clean-up.

Will merge to 'master'.
source: <[email protected]>

This isn't ready yet (still need to reroll).

Quoted 17 lines

[...]

* la/trailer-test-and-doc-updates (2023-09-07) 13 commits
- trailer doc: <token> is a <key> or <keyAlias>, not both
- trailer doc: separator within key suppresses default separator
- trailer doc: emphasize the effect of configuration variables
- trailer --unfold help: prefer "reformat" over "join"
- trailer --parse docs: add explanation for its usefulness
- trailer --only-input: prefer "configuration variables" over "rules"
- trailer --parse help: expose aliased options
- trailer --no-divider help: describe usual "---" meaning
- trailer: trailer location is a place, not an action
- trailer doc: narrow down scope of --where and related flags
- trailer: add tests to check defaulting behavior with --no-* flags
- trailer test description: this tests --where=after, not --where=before
- trailer tests: make test cases self-contained

Quoted 6 lines
Quoted 2 lines

Test coverage for trailers has been improved.
source: <[email protected]>

Did you forget to add "Need more reviews"? Not sure what the status is for the overall series (modulo your targetd comments for some of the patches).

I do not have status comment for this one because I do not know what its status is.

#6 lore raw
In reply to Linus Arver
Quoted 15 lines · Linus Arver
Quoted 13 lines · Junio C Hamano

[Cooking]

[...]

* la/trailer-cleanups (2023-09-11) 6 commits
(merged to 'next' on 2023-09-12 at 779c4a097a)
+ trailer: use offsets for trailer_start/trailer_end
+ trailer: rename *_DEFAULT enums to *_UNSPECIFIED
+ trailer: teach find_patch_start about --no-divider
+ trailer: split process_command_line_args into separate functions
+ trailer: split process_input_file into separate pieces
+ trailer: separate public from internal portion of trailer_iterator

Quoted 6 lines
Quoted 4 lines

Code clean-up.

Will merge to 'master'.
source: <[email protected]>

This isn't ready yet (still need to reroll).

Whoa, wait. I wasn't aware of any more comments that needed addressing. Whatever improvements you have in mind, if they are minor, letting the above graduate (they have been in 'next' for a week without anybody complaining) and doing them as a follow-up series would be sensible, I would think.

Thanks.

#7 lore raw
Quoted 19 lines · Junio C Hamano
Quoted 17 lines · Linus Arver
Quoted 15 lines · Junio C Hamano

[Cooking]

[...]

* la/trailer-cleanups (2023-09-11) 6 commits
(merged to 'next' on 2023-09-12 at 779c4a097a)
+ trailer: use offsets for trailer_start/trailer_end
+ trailer: rename *_DEFAULT enums to *_UNSPECIFIED
+ trailer: teach find_patch_start about --no-divider
+ trailer: split process_command_line_args into separate functions
+ trailer: split process_input_file into separate pieces
+ trailer: separate public from internal portion of trailer_iterator

Code clean-up.

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

Will merge to 'master'.
source: <[email protected]>

This isn't ready yet (still need to reroll).

Whoa, wait. I wasn't aware of any more comments that needed addressing.

Perhaps you missed my comment [1]?

Quoted 6 lines

Whatever improvements you have in mind, if they are minor, letting the above graduate (they have been in 'next' for a week without anybody complaining) and doing them as a follow-up series would be sensible, I would think.

Thanks.

Hmm, I don't think they are minor? See
https://github.com/listx/git/tree/trailer-libification-prep for the current state of things.

I need to still follow up to your last comment on "trailer: rename *_DEFAULT enums to *_UNSPECIFIED" [2] (I was going to see if we needed the "obvious solution" as you described).

If it's too painful to move this out of 'next' now, I'm OK with it graduating as is and doing a separate follow-up (I expect several more of these to happen anyway). Up to you.

Sorry for not noticing that this was in 'next' sooner and communicating accordingly.

[1] https://lore.kernel.org/git/[email protected]/T/#m0131f9829c35d8e0103ffa88f07d8e0e43dd732c
[2] https://lore.kernel.org/git/[email protected]/T/#md4ff2235720e921a2e031665f4da054d82edd506

#8 lore raw
Quoted 10 lines · Linus Arver
Quoted 6 lines

Whatever improvements you have in mind, if they are minor, letting the above graduate (they have been in 'next' for a week without anybody complaining) and doing them as a follow-up series would be sensible, I would think.

Thanks.

Hmm, I don't think they are minor? See
https://github.com/listx/git/tree/trailer-libification-prep for the current state of things.

They do not look like "oops the patches I sent to the list was totally bogus and they need replacing"; aren't they rather "these are not yet complete and there are some of the follow-on work on top of them"?

Quoted 7 lines

I need to still follow up to your last comment on "trailer: rename *_DEFAULT enums to *_UNSPECIFIED" [2] (I was going to see if we needed the "obvious solution" as you described).

If it's too painful to move this out of 'next' now, I'm OK with it graduating as is and doing a separate follow-up (I expect several more of these to happen anyway). Up to you.

Let's mark the topic as "waiting for follow-up updates" and keep it in 'next' until the follow-up patches become ready, then.

Quoted 2 lines

Sorry for not noticing that this was in 'next' sooner and communicating accordingly.

Gotchas happen. Let's try to communicate better the next time.

Thanks.

#9 lore raw
Quoted 9 lines · Junio C Hamano
Quoted 7 lines · Linus Arver
Quoted 6 lines

Whatever improvements you have in mind, if they are minor, letting the above graduate (they have been in 'next' for a week without anybody complaining) and doing them as a follow-up series would be sensible, I would think.

Thanks.

Quoted 8 lines
Quoted 3 lines

Hmm, I don't think they are minor? See
https://github.com/listx/git/tree/trailer-libification-prep for the current state of things.

They do not look like "oops the patches I sent to the list was totally bogus and they need replacing"; aren't they rather "these are not yet complete and there are some of the follow-on work on top of them"?

Yes, precisely.

Quoted 10 lines
Quoted 7 lines

I need to still follow up to your last comment on "trailer: rename *_DEFAULT enums to *_UNSPECIFIED" [2] (I was going to see if we needed the "obvious solution" as you described).

If it's too painful to move this out of 'next' now, I'm OK with it graduating as is and doing a separate follow-up (I expect several more of these to happen anyway). Up to you.

Let's mark the topic as "waiting for follow-up updates" and keep it in 'next' until the follow-up patches become ready, then.

Sounds good.

Quoted 6 lines
Quoted 2 lines

Sorry for not noticing that this was in 'next' sooner and communicating accordingly.

Gotchas happen. Let's try to communicate better the next time.

Thanks.

Thanks!