summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-09-05 16:54:42 -0700
committerJunio C Hamano <gitster@pobox.com>2023-09-05 16:54:42 -0700
commit05c5b73108a8212ac96a5c82241afbdd4caae6f0 (patch)
tree4db04f3f8d20a49ec60185a65cd9ff9eb4b80020
parentc88cb83533edcc56d003ecae18050b0f37359e67 (diff)
downloadgit-05c5b73108a8212ac96a5c82241afbdd4caae6f0.tar.gz
What's cooking (2023/09 #02)
-rw-r--r--whats-cooking.txt532
1 files changed, 179 insertions, 353 deletions
diff --git a/whats-cooking.txt b/whats-cooking.txt
index 97794846c0..0feb7048b7 100644
--- a/whats-cooking.txt
+++ b/whats-cooking.txt
@@ -1,10 +1,10 @@
To: git@vger.kernel.org
-Subject: What's cooking in git.git (Sep 2023, #01; Fri, 1)
-X-master-at: d814540bb75bbd2257f9a6bf59661a84fe8cf3cf
-X-next-at: 54e51ff1ac8d5254ec31bb709a94c598aa7cdeda
+Subject: What's cooking in git.git (Sep 2023, #02; Tue, 5)
+X-master-at: 1fc548b2d6a3596f3e1c1f8b1930d8dbd1e30bf3
+X-next-at: b48617a3a5a37018fe707db5c6041699c4579ab7
Bcc: lwn@lwn.net, gitster@pobox.com
-What's cooking in git.git (Sep 2023, #01; Fri, 1)
+What's cooking in git.git (Sep 2023, #02; Tue, 5)
--------------------------------------------------
Here are the topics that have been cooking in my tree. Commits
@@ -48,146 +48,197 @@ Release tarballs are available at:
--------------------------------------------------
[Graduated to 'master']
-* ch/t6300-verify-commit-test-cleanup (2023-08-23) 2 commits
- (merged to 'next' on 2023-08-24 at 15b842867e)
- + t/t6300: drop magic filtering
- + t/lib-gpg: forcibly run a trustdb update
+* jk/test-lsan-denoise-output (2023-08-28) 1 commit
+ (merged to 'next' on 2023-08-29 at 9642d76264)
+ + test-lib: ignore uninteresting LSan output
+
+ Tests with LSan from time to time seem to emit harmless message
+ that makes our tests unnecessarily flakey; we work it around by
+ filtering the uninteresting output.
+ source: <20230828183735.GA3015072@coredump.intra.peff.net>
+
+
+* js/ci-san-skip-p4-and-svn-tests (2023-08-29) 1 commit
+ (merged to 'next' on 2023-08-29 at 9617f99668)
+ + ci(linux-asan-ubsan): let's save some time
+
+ Flakey "git p4" tests, as well as "git svn" tests, are now skipped
+ in the (rather expensive) sanitizer CI job.
+ source: <pull.1578.v2.git.1693342048633.gitgitgadget@gmail.com>
+
+
+* rs/parse-options-help-text-is-optional (2023-08-28) 1 commit
+ (merged to 'next' on 2023-08-29 at 5466f7fcb2)
+ + parse-options: allow omitting option help text
- Test clean-up.
- source: <20230822150149.541ccb35@leda.eworm.net>
+ 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.
+ source: <2b08dc43-621d-2170-c4a6-c2aac33a9a19@web.de>
-* 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
+* tb/mark-more-tests-as-leak-free (2023-08-29) 3 commits
+ (merged to 'next' on 2023-08-29 at c1db288281)
+ + leak tests: mark t5583-push-branches.sh as leak-free
+ + leak tests: mark t3321-notes-stripspace.sh as leak-free
+ + leak tests: mark a handful of tests as leak-free
- Scalar updates.
- source: <pull.1569.v3.git.1693230746.gitgitgadget@gmail.com>
+ Tests that are known to pass with LSan are now marked as such.
+ source: <cover.1693263171.git.me@ttaylorr.com>
+
+--------------------------------------------------
+[New Topics]
+* bc/more-git-var (2023-09-05) 1 commit
+ - var: avoid a segmentation fault when `HOME` is unset
-* jc/ci-skip-same-commit (2023-08-25) 1 commit
- (merged to 'next' on 2023-08-28 at e978717961)
- + ci: avoid building from the same commit in parallel
+ source: <pull.1580.git.1693808487058.gitgitgadget@gmail.com>
- 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.
- source: <1da763f3-60bf-a572-2c71-336b1fa5553d@gmx.de>
+* ks/ref-filter-sort-numerically (2023-09-05) 1 commit
+ - ref-filter: sort numerically when ":size" is used
-* jc/diff-exit-code-with-w-fixes (2023-08-21) 5 commits
- (merged to 'next' on 2023-08-23 at 436a0aec3d)
- + diff: the -w option breaks --exit-code for --raw and other output modes
- + t4040: remove test that succeeded for a wrong reason
- + diff: teach "--stat -w --exit-code" to notice differences
- + diff: mode-only change should be noticed by "--patch -w --exit-code"
- + diff: move the fallback "--exit-code" code down
+ source: <20230902090155.8978-1-five231003@gmail.com>
- "git diff -w --exit-code" with various options did not work
- correctly, which is being addressed.
- source: <20230818235932.3253552-1-gitster@pobox.com>
+* ob/sequencer-reword-error-message (2023-09-05) 1 commit
+ - sequencer: fix error message on failure to copy SQUASH_MSG
-* jc/mv-d-to-d-error-message-fix (2023-08-11) 1 commit
- (merged to 'next' on 2023-08-21 at 2220d22d6f)
- + mv: fix error for moving directory to another
+ source: <20230903151132.739136-1-oswald.buddenhagen@gmx.de>
- Typofix in an error message.
- source: <xmqqjzu1njt0.fsf@gitster.g>
+* rs/grep-parseopt-simplify (2023-09-05) 1 commit
+ - grep: use OPT_INTEGER_F for --max-depth
-* jk/diff-result-code-cleanup (2023-08-21) 7 commits
- (merged to 'next' on 2023-08-25 at 3b1280d42f)
- + diff: drop useless "status" parameter from diff_result_code()
- + diff: drop useless return values in git-diff helpers
- + diff: drop useless return from run_diff_{files,index} functions
- + diff: die when failing to read index in git-diff builtin
- + diff: show usage for unknown builtin_diff_files() options
- + diff-files: avoid negative exit value
- + diff: spell DIFF_INDEX_CACHED out when calling run_diff_index()
+ source: <4d2eb736-4f34-18f8-2eb7-20e7f7b8c2f8@web.de>
- "git diff --no-such-option" and other corner cases around the exit
- status of the "diff" command has been corrected.
- source: <20230821201358.GA2663749@coredump.intra.peff.net>
+* rs/name-rev-use-opt-hidden-bool (2023-09-05) 1 commit
+ - name-rev: use OPT_HIDDEN_BOOL for --peel-tag
+
+ source: <5a86c8f8-fcdc-fee9-8af5-aa5ecb036d2e@web.de>
+
+--------------------------------------------------
+[Stalled]
+
+* la/trailer-cleanups (2023-08-06) 5 commits
+ - 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.
+
+ Expecting a reroll.
+ cf. <owlyy1iifq0n.fsf@fine.c.googlers.com>
+ source: <pull.1563.git.1691211879.gitgitgadget@gmail.com>
+
+
+* la/trailer-test-and-doc-updates (2023-08-10) 14 commits
+ - SQUASH???
+ - 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.
+
+ Expecting a reroll.
+ cf. <owlyh6p5fpi7.fsf@fine.c.googlers.com>
+ source: <pull.1564.v2.git.1691702283.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
+ - 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.
-* ob/format-patch-description-file (2023-08-21) 1 commit
- (merged to 'next' on 2023-08-25 at 89ea619311)
- + format-patch: add --description-file option
+ Comments?
+ source: <cover.1692297001.git.steadmon@google.com>
- "git format-patch" learns a way to feed cover letter description,
- that (1) can be used on detached HEAD where there is no branch
- description available, and (2) also can override the branch
- description if there is one.
- source: <20230821170720.577820-1-oswald.buddenhagen@gmx.de>
+* ak/pretty-decorate-more (2023-08-21) 8 commits
+ - 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"
-* ob/sequencer-empty-hint-fix (2023-08-24) 1 commit
- (merged to 'next' on 2023-08-24 at 626c52ad72)
- + sequencer: rectify empty hint in call of require_clean_work_tree()
+ "git log --format" has been taught the %(decorate) placeholder.
- The use of API between two calls to require_clean_work_tree() from
- the sequencer code has been cleaned up for consistency.
- source: <20230824150046.802008-1-oswald.buddenhagen@gmx.de>
+ What's the status of this thing?
+ source: <20230820185009.20095-1-andy.koppe@gmail.com>
-* py/git-gui-updates (2023-08-24) 16 commits
- (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
+* 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 GUI updates.
+ "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>
-* sl/sparse-check-attr (2023-08-11) 3 commits
- (merged to 'next' on 2023-08-21 at c202b15517)
- + check-attr: integrate with sparse-index
- + attr.c: read attributes in a sparse directory
- + t1092: add tests for 'git check-attr'
- Teach "git check-attr" work better with sparse-index.
- cf. <3b2a5b4b-ab8f-746b-6b69-8e8262b6390b@github.com>
- source: <20230811142211.4547-1-cheskaqiqi@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>
-* tb/commit-graph-verify-fix (2023-08-21) 4 commits
- (merged to 'next' on 2023-08-23 at 2b4b74bb0d)
- + commit-graph: avoid repeated mixed generation number warnings
- + t/t5318-commit-graph.sh: test generation zero transitions during fsck
- + commit-graph: verify swapped zero/non-zero generation cases
- + commit-graph: introduce `commit_graph_generation_from_graph()`
- The commit-graph verification code that detects mixture of zero and
- non-zero generation numbers has been updated.
- source: <cover.1692653671.git.me@ttaylorr.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.
-* ts/unpacklimit-config-fix (2023-08-22) 1 commit
- (merged to 'next' on 2023-08-23 at 4fabd9a697)
- + transfer.unpackLimit: fetch/receive.unpackLimit takes precedence
-
- transfer.unpackLimit ought to be used as a fallback, but overrode
- fetch.unpackLimit and receive.unpackLimit instead.
- source: <xmqqpm3eh7f6.fsf@gitster.g>
+ Expecting a reroll.
+ cf. <999f12b2-38d6-f446-e763-4985116ad37d@gmail.com>
+ source: <pull.1535.v2.git.1685264889088.gitgitgadget@gmail.com>
--------------------------------------------------
-[New Topics]
+[Cooking]
* dd/format-patch-rfc-updates (2023-08-31) 1 commit
(merged to 'next' on 2023-09-01 at ad87c89ee3)
@@ -203,18 +254,6 @@ Release tarballs are available at:
source: <20230830064646.30904-1-sir@cmpwn.com>
-* jk/test-lsan-denoise-output (2023-08-28) 1 commit
- (merged to 'next' on 2023-08-29 at 9642d76264)
- + test-lib: ignore uninteresting LSan output
-
- Tests with LSan from time to time seem to emit harmless message
- that makes our tests unnecessarily flakey; we work it around by
- filtering the uninteresting output.
-
- Will merge to 'master'.
- source: <20230828183735.GA3015072@coredump.intra.peff.net>
-
-
* jk/unused-post-2.42 (2023-08-29) 22 commits
(merged to 'next' on 2023-08-30 at ab0538e754)
+ update-ref: mark unused parameter in parser callbacks
@@ -247,17 +286,6 @@ Release tarballs are available at:
source: <20230829234305.GA226944@coredump.intra.peff.net>
-* js/ci-san-skip-p4-and-svn-tests (2023-08-29) 1 commit
- (merged to 'next' on 2023-08-29 at 9617f99668)
- + ci(linux-asan-ubsan): let's save some time
-
- Flakey "git p4" tests, as well as "git svn" tests, are now skipped
- in the (rather expensive) sanitizer CI job.
-
- Will merge to 'master'.
- source: <pull.1578.v2.git.1693342048633.gitgitgadget@gmail.com>
-
-
* tb/multi-cruft-pack (2023-08-29) 4 commits
(merged to 'next' on 2023-08-30 at 15f0b56ed0)
+ Documentation/gitformat-pack.txt: drop mixed version section
@@ -294,22 +322,23 @@ Release tarballs are available at:
source: <xmqqa5u888lz.fsf_-_@gitster.g>
-* jk/unused-post-2.42-part2 (2023-08-31) 10 commits
- - 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
+* 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.
- Will merge to 'next'?
+ Will merge to 'master'.
source: <20230831211637.GA949188@coredump.intra.peff.net>
@@ -342,108 +371,13 @@ Release tarballs are available at:
* ew/hash-with-openssl-evp (2023-08-31) 1 commit
- - treewide: fix various bugs w/ OpenSSL 3+ EVP API
+ (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.
- Will merge to 'next'?
- source: <20230901020928.M610756@dcvr>
-
---------------------------------------------------
-[Stalled]
-
-* 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.
-
- Comments?
- source: <cover.1692297001.git.steadmon@google.com>
-
-
-* ak/pretty-decorate-more (2023-08-21) 8 commits
- - 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.
-
- What's the status of this thing?
- source: <20230820185009.20095-1-andy.koppe@gmail.com>
-
-
-* 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>
-
-
-* 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]
-
-* rs/parse-options-help-text-is-optional (2023-08-28) 1 commit
- (merged to 'next' on 2023-08-29 at 5466f7fcb2)
- + parse-options: allow omitting option help text
-
- 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.
-
Will merge to 'master'.
- source: <2b08dc43-621d-2170-c4a6-c2aac33a9a19@web.de>
+ source: <20230901020928.M610756@dcvr>
* tb/path-filter-fix (2023-08-30) 15 commits
@@ -485,18 +419,6 @@ Release tarballs are available at:
source: <cover.1692827403.git.steadmon@google.com>
-* tb/mark-more-tests-as-leak-free (2023-08-29) 3 commits
- (merged to 'next' on 2023-08-29 at c1db288281)
- + leak tests: mark t5583-push-branches.sh as leak-free
- + leak tests: mark t3321-notes-stripspace.sh as leak-free
- + leak tests: mark a handful of tests as leak-free
-
- Tests that are known to pass with LSan are now marked as such.
-
- Will merge to 'master'.
- source: <cover.1693263171.git.me@ttaylorr.com>
-
-
* jc/update-index-show-index-version (2023-08-18) 3 commits
- test-tool: retire "index-version"
- update-index: add --show-index-version
@@ -509,53 +431,15 @@ Release tarballs are available at:
source: <20230818233729.2766281-1-gitster@pobox.com>
-* ob/revert-of-revert-is-reapply (2023-08-21) 2 commits
+* ob/revert-of-revert-is-reapply (2023-09-02) 2 commits
- 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.
- Expecting a (hopefully small and final) reroll.
- cf. <ZOZnNDd2pMX6M2Au@nand.local>
- source: <20230809171531.2564807-1-oswald.buddenhagen@gmx.de>
-
-
-* la/trailer-cleanups (2023-08-06) 5 commits
- - 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.
-
- Expecting a reroll.
- cf. <owlyy1iifq0n.fsf@fine.c.googlers.com>
- source: <pull.1563.git.1691211879.gitgitgadget@gmail.com>
-
-
-* la/trailer-test-and-doc-updates (2023-08-10) 14 commits
- - SQUASH???
- - 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.
-
- Expecting a reroll.
- cf. <owlyh6p5fpi7.fsf@fine.c.googlers.com>
- source: <pull.1564.v2.git.1691702283.gitgitgadget@gmail.com>
+ Will merge to 'next'.
+ source: <20230821170720.577850-1-oswald.buddenhagen@gmx.de>
* jc/rerere-cleanup (2023-08-25) 4 commits
@@ -617,61 +501,3 @@ Release tarballs are available at:
Needs review.
cf. <xmqqtttia3vn.fsf@gitster.g>
source: <48745298-f12b-8efb-4e48-90d2c22a8349@gmail.com>
-
---------------------------------------------------
-[Discarded]
-
-* jt/path-filter-fix (2023-08-08) 8 commits
- (merged to 'next' on 2023-08-09 at 59952b9ec9)
- + commit-graph: fix small leak with invalid changedPathsVersion
- (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.
-
- Reverted out of 'next', superseded by the tb/path-filter-fix topic.
- cf. <ZMqp6K2iXixWH/zT@nand.local>
- source: <cover.1690912539.git.jonathantanmy@google.com>
- source: <20230808192240.GA4091261@coredump.intra.peff.net>
-
-
-* ab/tag-object-type-errors (2023-05-10) 4 commits
- . tag: don't emit potentially incorrect "object is a X, not a Y"
- . tag: don't misreport type of tagged objects in errors
- . object tests: add test for unexpected objects in tags
- . Merge branch 'jk/parse-object-type-mismatch' into ab/tag-object-type-errors
-
- Hardening checks around mismatched object types when one of those
- objects is a tag.
-
- Stalled for too long.
- source: <cover-v2-0.3-00000000000-20221230T011725Z-avarab@gmail.com>
-
-
-* ob/send-email-interactive-failure (2023-08-29) 2 commits
- . SQUASH???
- . 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.
-
- Breaks existing users without even an opt-out knob.
- source: <20230821170720.577835-1-oswald.buddenhagen@gmx.de>
-
-
-* ws/svn-with-new-readline (2023-08-11) 1 commit
- . git-svn: avoid creating more than one than one Term::ReadLine object
-
- Adjust to newer Term::ReadLine to prevent it from breaking
- the interactive prompt code in git-svn.
-
- Superseded by ws/git-svn-retire-faketerm
- source: <20230810011831.1423208-1-wesleys@opperschaap.net>