eyecatchu/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-12 13:53:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

What's cooking (2023/07 #05)

Browse Source
This commit is contained in:
Junio C Hamano 2023-07-25 12:38:40 -07:00
parent a591f232b5
commit cdae53671e
1 changed files with 365 additions and 450 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

815
whats-cooking.txt
View File

@ -1,10 +1,10 @@
To: git@vger.kernel.org
Subject: What's cooking in git.git (Jul 2023, #04; Wed, 19)
X-master-at: cba07a324d2cda06dd7a7b35b4579f800de024aa
X-next-at: 738d25bbb685449ecded16e19329234bf5fa711f
Subject: What's cooking in git.git (Jul 2023, #05; Tue, 25)
X-master-at: a80be152923a46f04a06bade7bcc72870e46ca09
X-next-at: 7dcf015ea4152b2113f79acb1e230aef744551f3
Bcc: lwn@lwn.net, gitster@pobox.com
What's cooking in git.git (Jul 2023, #04; Wed, 19)
What's cooking in git.git (Jul 2023, #05; Tue, 25)
--------------------------------------------------
Here are the topics that have been cooking in my tree. Commits
@ -48,161 +48,47 @@ Release tarballs are available at:
--------------------------------------------------
[Graduated to 'master']
* cw/compat-util-header-cleanup (2023-07-05) 6 commits
(merged to 'next' on 2023-07-08 at c244b65c4f)
+ git-compat-util: move alloc macros to git-compat-util.h
+ treewide: remove unnecessary includes for wrapper.h
+ kwset: move translation table from ctype
+ sane-ctype.h: create header for sane-ctype macros
+ git-compat-util: move wrapper.c funcs to its header
+ git-compat-util: move strbuf.c funcs to its header
* ah/advise-force-pushing (2023-07-13) 3 commits
(merged to 'next' on 2023-07-17 at b040e8280e)
+ push: don't imply that integration is always required before pushing
+ remote: don't imply that integration is always required before pushing
+ wt-status: don't show divergence advice when committing
Further shuffling of declarations across header files to streamline
file dependencies.
source: <20230705170812.3833103-1-calvinwan@google.com>
Help newbies by suggesting that there are cases where force-pushing
is a valid and sensible thing to update a branch at a remote
repository, rather than reconciling with merge/rebase.
source: <20230713044128.3771818-1-alexhenrie24@gmail.com>
* jc/pathspec-match-with-common-prefix (2023-07-08) 2 commits
(merged to 'next' on 2023-07-10 at 4146f391ed)
+ dir: match "attr" pathspec magic with correct paths
+ t6135: attr magic with path pattern
"git ls-files '(attr:X)D/'" that triggers the common prefix
optimization codepath failed to read from "D/.gitattributes",
which has been corrected.
source: <20230707220457.3655121-1-gitster@pobox.com>
* jk/imap-send-unused-variable-cleanup (2023-07-05) 3 commits
(merged to 'next' on 2023-07-06 at d2798ee0fe)
+ imap-send: drop unused fields from imap_cmd_cb
+ imap-send: drop unused parameter from imap_cmd_cb callback
+ imap-send: use server conf argument in setup_curl()
"imap-send" codepaths got cleaned up to get rid of unused
parameters.
source: <20230703063247.GA3524302@coredump.intra.peff.net>
* ks/ref-filter-signature (2023-06-06) 2 commits
(merged to 'next' on 2023-07-06 at 1748d2bb93)
+ ref-filter: add new "signature" atom
+ t/lib-gpg: introduce new prereq GPG2
The "git for-each-ref" family of commands learned placeholders
related to GPG signature verification.
cf. <CAP8UFD1CfUm+9PTXO0wBBdBs0U=YVte+EiPbDyUyg7T152aw2g@mail.gmail.com>
source: <20230604185815.15761-1-five231003@gmail.com>
* ma/t0091-fixup (2023-07-05) 1 commit
(merged to 'next' on 2023-07-06 at 3f82b468b4)
+ t0091-bugreport.sh: actually verify some content of report
"git bugreport" tests did not test what it wanted to test, which
has been corrected.
source: <20230705183532.3057433-1-martin.agren@gmail.com>
* mh/doc-credential-helpers (2023-07-10) 1 commit
(merged to 'next' on 2023-07-11 at a391669194)
+ doc: gitcredentials: link to helper list
Doc update.
source: <pull.1538.v3.git.1688848614262.gitgitgadget@gmail.com>
* pw/diff-no-index-from-named-pipes (2023-07-05) 4 commits
(merged to 'next' on 2023-07-08 at 225230a441)
+ diff --no-index: support reading from named pipes
+ t4054: test diff --no-index with stdin
+ diff --no-index: die on error reading stdin
+ diff --no-index: refuse to compare stdin to a directory
"git diff --no-index" learned to read from named pipes as if they
were regular files, to allow "git diff <(process) <(substitution)"
some shells support.
source: <cover.1688586536.git.phillip.wood@dunelm.org.uk>
* rs/ls-tree-prefix-simplify (2023-07-07) 1 commit
(merged to 'next' on 2023-07-08 at 3e4826525f)
+ ls-tree: simplify prefix handling
Code simplification.
source: <b34aa99b-2bf1-c645-bdf5-03ac258b4bf5@web.de>
* rs/packet-length-simplify (2023-07-07) 1 commit
(merged to 'next' on 2023-07-08 at 7f4b52e75b)
+ pkt-line: add size parameter to packet_length()
Code simplification.
source: <4d2bb49b-9c3c-ea58-274b-d9e9586620c1@web.de>
* rs/pretty-format-double-negation-fix (2023-07-07) 1 commit
(merged to 'next' on 2023-07-08 at 6674b562ff)
+ pretty: avoid double negative in format_commit_item()
Code clarification.
source: <8d4fcad1-5f71-4790-17ee-e9ba0a3118dc@web.de>
* rs/userformat-find-requirements-simplify (2023-07-07) 1 commit
(merged to 'next' on 2023-07-08 at 6cdc328a08)
+ pretty: use strchr(3) in userformat_find_requirements()
Code simplification.
source: <108ab1a2-28f4-dd62-1f90-64f37708aa8c@web.de>
* tb/fsck-no-progress (2023-07-10) 6 commits
(merged to 'next' on 2023-07-11 at aab8389518)
+ commit-graph.c: avoid duplicated progress output during `verify`
+ commit-graph.c: pass progress to `verify_one_commit_graph()`
+ commit-graph.c: iteratively verify commit-graph chains
+ commit-graph.c: extract `verify_one_commit_graph()`
+ fsck: suppress MIDX output with `--no-progress`
+ fsck: suppress commit-graph output with `--no-progress`
"git fsck --no-progress" still spewed noise from the commit-graph
subsystem, which has been corrected.
source: <cover.1688776280.git.me@ttaylorr.com>
* tb/repack-cleanup (2023-07-11) 2 commits
(merged to 'next' on 2023-07-11 at f598c59a8a)
+ builtin/repack.c: avoid dir traversal in `collect_pack_filenames()`
+ builtin/repack.c: only repack `.pack`s that exist
The recent change to "git repack" made it react less nicely when a
leftover .idx file that no longer has the corresponding .pack file
in the repository, which has been corrected.
source: <cover.1689096750.git.me@ttaylorr.com>
* vd/adjust-mfow-doc-to-updated-headers (2023-07-04) 1 commit
(merged to 'next' on 2023-07-08 at 38103c697d)
+ docs: add necessary headers to Documentation/MFOW.txt
Code snippets in a tutorial document no longer compiled after
recent header shuffling, which have been corrected.
source: <20230702151457.3227-1-vinayakdev.sci@gmail.com>
--------------------------------------------------
[New Topics]
* dk/bundle-i18n-more (2023-07-13) 1 commit
(merged to 'next' on 2023-07-18 at a9745efbe2)
+ i18n: mark more bundle.c strings for translation
Update message mark-up for i18n in "git bundle".
Will merge to 'master'.
source: <pull.1550.git.1689285683013.gitgitgadget@gmail.com>
* dk/t4002-syntaxo-fix (2023-07-14) 1 commit
(merged to 'next' on 2023-07-17 at 75d729ee52)
+ t4002: fix "diff can read from stdin" syntax
Test fix.
source: <pull.1545.git.git.1689341410476.gitgitgadget@gmail.com>
* jk/nested-points-at (2023-07-17) 4 commits
(merged to 'next' on 2023-07-18 at cf33f44a50)
+ ref-filter: simplify return type of match_points_at
+ ref-filter: avoid parsing non-tags in match_points_at()
+ ref-filter: avoid parsing tagged objects in match_points_at()
+ ref-filter: handle nested tags in --points-at option
"git tag --list --points-at X" showed tags that directly refers to
object X, but did not list a tag that points at such a tag, which
has been corrected.
source: <20230702223342.GA1598765@coredump.intra.peff.net>
* jk/unused-parameter (2023-07-13) 14 commits
(merged to 'next' on 2023-07-18 at 59d8f4ec1e)
+ t/helper: mark unused callback void data parameters
@ -222,34 +108,18 @@ Release tarballs are available at:
Mark-up unused parameters in the code so that we can eventually
enable -Wunused-parameter by default.
Will merge to 'master'.
source: <20230703064347.GA3524892@coredump.intra.peff.net>
* dk/t4002-syntaxo-fix (2023-07-14) 1 commit
(merged to 'next' on 2023-07-17 at 75d729ee52)
+ t4002: fix "diff can read from stdin" syntax
* mh/mingw-case-sensitive-build (2023-06-12) 1 commit
(merged to 'next' on 2023-07-17 at 2c72856851)
+ mingw: use lowercase includes for some Windows headers
Test fix.
Will merge to 'master'.
source: <pull.1545.git.git.1689341410476.gitgitgadget@gmail.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
Clarify how to choose the starting point for a new topic in
developer guidance document.
Will merge to 'master'.
source: <pull.1556.v2.git.1689314493.gitgitgadget@gmail.com>
Names of MinGW header files are spelled in mixed case in some
source files, but the build host can be using case sensitive
filesystem with header files with their name spelled in all
lowercase.
source: <20230604211934.1365289-1-mh@glandium.org>
* rs/ref-filter-signature-fix (2023-07-17) 1 commit
@ -257,8 +127,6 @@ Release tarballs are available at:
+ t6300: fix setup with GPGSSH but without GPG
Test fix.
Will merge to 'master'.
source: <cbc22750-af93-9274-2ed4-6dfd356568e8@web.de>
@ -267,142 +135,206 @@ Release tarballs are available at:
+ strbuf: use skip_prefix() in strbuf_addftime()
Code clean-up.
Will merge to 'master'.
source: <fccba24c-584d-6329-69a7-75cf0458af7d@web.de>
* jk/nested-points-at (2023-07-17) 4 commits
(merged to 'next' on 2023-07-18 at cf33f44a50)
+ ref-filter: simplify return type of match_points_at
+ ref-filter: avoid parsing non-tags in match_points_at()
+ ref-filter: avoid parsing tagged objects in match_points_at()
+ ref-filter: handle nested tags in --points-at option
* tb/object-access-overflow-protection (2023-07-14) 20 commits
(merged to 'next' on 2023-07-17 at 9ad8a08011)
+ commit-graph.c: prevent overflow in `verify_commit_graph()`
+ commit-graph.c: prevent overflow in `write_commit_graph()`
+ commit-graph.c: prevent overflow in `merge_commit_graph()`
+ commit-graph.c: prevent overflow in `split_graph_merge_strategy()`
+ commit-graph.c: prevent overflow in `load_tree_for_commit()`
+ commit-graph.c: prevent overflow in `fill_commit_in_graph()`
+ commit-graph.c: prevent overflow in `fill_commit_graph_info()`
+ commit-graph.c: prevent overflow in `load_oid_from_graph()`
+ commit-graph.c: prevent overflow in add_graph_to_chain()
+ commit-graph.c: prevent overflow in `write_commit_graph_file()`
+ pack-bitmap.c: ensure that eindex lookups don't overflow
+ midx.c: prevent overflow in `fill_included_packs_batch()`
+ midx.c: prevent overflow in `write_midx_internal()`
+ midx.c: store `nr`, `alloc` variables as `size_t`'s
+ midx.c: prevent overflow in `nth_midxed_offset()`
+ midx.c: prevent overflow in `nth_midxed_object_oid()`
+ midx.c: use `size_t`'s for fanout nr and alloc
+ packfile.c: use checked arithmetic in `nth_packed_object_offset()`
+ packfile.c: prevent overflow in `load_idx()`
+ packfile.c: prevent overflow in `nth_packed_object_id()`
"git tag --list --points-at X" showed tags that directly refers to
object X, but did not list a tag that points at such a tag, which
has been corrected.
Various offset computation in the code that accesses the packfiles
and other data in the object layer has been hardened against
arithmetic overflow, especially on 32-bit systems.
source: <ZLAJNbIBFUPHYhlt@nand.local>
source: <cover.1689205042.git.me@ttaylorr.com>
* tb/refs-exclusion-and-packed-refs (2023-07-10) 16 commits
(merged to 'next' on 2023-07-13 at 6d72f3e995)
+ ls-refs.c: avoid enumerating hidden refs where possible
+ upload-pack.c: avoid enumerating hidden refs where possible
+ builtin/receive-pack.c: avoid enumerating hidden references
+ refs.h: implement `hidden_refs_to_excludes()`
+ refs.h: let `for_each_namespaced_ref()` take excluded patterns
+ revision.h: store hidden refs in a `strvec`
+ refs/packed-backend.c: add trace2 counters for jump list
+ refs/packed-backend.c: implement jump lists to avoid excluded pattern(s)
+ refs/packed-backend.c: refactor `find_reference_location()`
+ refs: plumb `exclude_patterns` argument throughout
+ builtin/for-each-ref.c: add `--exclude` option
+ ref-filter.c: parameterize match functions over patterns
+ ref-filter: add `ref_filter_clear()`
+ ref-filter: clear reachable list pointers after freeing
+ ref-filter.h: provide `REF_FILTER_INIT`
+ refs.c: rename `ref_filter`
Enumerating refs in the packed-refs file, while excluding refs that
match certain patterns, has been optimized.
source: <cover.1689023520.git.me@ttaylorr.com>
--------------------------------------------------
[New Topics]
* ah/sequencer-rewrite-todo-fix (2023-07-24) 1 commit
- sequencer: finish parsing the todo list despite an invalid first line
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.
Will merge to 'next'.
cf. <https://lore.kernel.org/git/0d1c5bfd-3ae5-83f0-a333-bbb8510a973a@gmail.com/>
source: <20230722212830.132135-2-alexhenrie24@gmail.com>
* bb/trace2-comment-fix (2023-07-19) 1 commit
(merged to 'next' on 2023-07-21 at f77aeba1b5)
+ trace2: fix a comment
In-code comment fix.
Will merge to 'master'.
source: <20230702223342.GA1598765@coredump.intra.peff.net>
source: <20230719232444.555838-1-dev+git@drbeat.li>
* jr/gitignore-doc-example-markup (2023-07-18) 1 commit
(merged to 'next' on 2023-07-19 at 4f2ece568d)
+ gitignore.txt: use backticks instead of double quotes
* ks/ref-filter-describe (2023-07-24) 2 commits
- ref-filter: add new "describe" atom
- ref-filter: add multiple-option parsing functions
Doc update.
"git branch --list --format=<format>" and friends are taught
a new "%(describe)" placeholder.
Will merge to 'master'.
source: <pull.1553.git.git.1689685982027.gitgitgadget@gmail.com>
Will merge to 'next'.
source: <20230723162717.68123-1-five231003@gmail.com>
* jc/am-parseopt-fix (2023-07-18) 1 commit
(merged to 'next' on 2023-07-19 at eaf592531e)
+ am: simplify parsing of "--[no-]keep-cr"
* bb/use-trace2-counters-for-fsync-stats (2023-07-20) 1 commit
- wrapper: use trace2 counters to collect fsync stats
Code simplification.
Instead of inventing a custom counter variables for debugging,
use existing trace2 facility in the fsync customization codepath.
Will merge to 'master'.
source: <xmqqr0p5gjv3.fsf@gitster.g>
Will merge to 'next'.
source: <20230720164823.625815-1-dev+git@drbeat.li>
* jc/branch-parseopt-fix (2023-07-18) 1 commit
(merged to 'next' on 2023-07-19 at 738d25bbb6)
+ branch: reject "--no-all" and "--no-remotes" early
* am/doc-sha256 (2023-07-20) 1 commit
- doc: sha256 is no longer experimental
Command line parser fixes.
Tone down the warning on SHA-256 repositories being an experimental
curiosity. We do not have support for them to interoperate with
traditional SHA-1 repositories, but at this point, we do not plan
to make breaking changes to SHA-256 repositories and there is no
longer need for such a strongly phrased warning.
Will merge to 'master'.
source: <xmqqjzuxgjmi.fsf@gitster.g>
Review comments sent.
cf. <xmqqr0p230rj.fsf@gitster.g>
source: <ZLlNtbAbVcYH7eFb@adams>
* rs/ls-tree-no-full-name-fix (2023-07-18) 1 commit
(merged to 'next' on 2023-07-19 at 86e570c084)
+ ls-tree: fix --no-full-name
* hy/blame-in-bare-with-contents (2023-07-21) 1 commit
- blame: allow --contents to work with bare repo
Command line parser fix.
Will merge to 'master'.
source: <d392a005-4eba-7cc7-9554-cdb8dc53975e@web.de>
* jc/describe-parseopt-fix (2023-07-18) 1 commit
- describe: --no-exact-match should not be the same as --exact-match
Command line parser fix.
Comments?
source: <xmqqy1jcgbiv.fsf@gitster.g>
* jc/doc-sent-patch-now-what (2023-07-19) 1 commit
- MyFirstContribution: refrain from self-iterating too much
Process document update.
"git blame --contents=file" has been taught to work in a bare
repository.
Will merge to 'next'?
source: <xmqqzga9opdu.fsf@gitster.g>
source: <20230721035758.61956-1-hanyang.tony@bytedance.com>
* jc/gitignore-doc-pattern-markup (2023-07-18) 1 commit
- gitignore.txt: mark up explanation of patterns consistently
* ja/worktree-orphan-fix (2023-07-21) 4 commits
- SQUASH???
- 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
Doc mark-up update.
Will merge to 'next'.
source: <xmqqwmyxglhg.fsf@gitster.g>
Expecting a reroll.
cf. <axnxvnmo6ekhhccppinji73ivlandwuqs44epmq4pdefm7ukiv@ejz7bee5xjli>
source: <20230721044012.24360-1-jacobabel@nullpo.dev>
* jc/parse-options-reset (2023-07-19) 1 commit
- reset: reject --no-(mixed|soft|hard|merge|keep) option
* rs/describe-parseopt-fix (2023-07-21) 1 commit
(merged to 'next' on 2023-07-21 at e74749af0c)
+ describe: fix --no-exact-match
Command line parser fix.
Will merge to 'master'.
source: <4eea7e15-6594-93e2-27b5-3d6e3c0baac6@web.de>
* rs/pack-objects-parseopt-fix (2023-07-21) 2 commits
(merged to 'next' on 2023-07-21 at acdf84416c)
+ pack-objects: fix --no-quiet
+ pack-objects: fix --no-keep-true-parents
Command line parser fix.
Will merge to 'master'.
source: <xmqqo7k9fa5x.fsf@gitster.g>
* jc/retire-get-sha1-hex (2023-07-24) 1 commit
- 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 'next'.
source: <xmqq1qh4c998.fsf@gitster.g>
source: <xmqq1qgwoqgo.fsf_-_@gitster.g>
* jc/parse-options-short-help (2023-07-18) 3 commits
- short help: allow a gap smaller than USAGE_GAP
- remote: simplify "remote add --tags" help text
- short help: allow multi-line opthelp
* rs/parse-options-negation-help (2023-07-24) 5 commits
- parse-options: show negatability of options in short help
- t1502: test option negation
- t1502: move optionspec help output to a file
- t1502, docs: disallow --no-help
- subtree: disallow --no-{help,quiet,debug,branch,message}
Command line parser fix, and a small parse-options API update.
"git cmd -h" learned to signal which options can be negated by
listing such options like "--[no-]opt".
Comments?
source: <xmqq5y6gg8fn.fsf@gitster.g>
Would showing "--[[no-]no-]opt" for "no-opt" be worth it?
cf. <9e8225dd-1e8b-8af2-c3e1-0c5834694244@web.de>
source: <4d01e971-07cb-4f11-3cc6-9d9f21e590c1@web.de>
* jc/parse-options-show-branch (2023-07-19) 2 commits
- show-branch: reject --[no-](topo|date)-order
- show-branch: --no-sparse should give dense output
* tb/commit-graph-tests (2023-07-24) 5 commits
- t/lib-commit-graph.sh: avoid sub-shell in `graph_git_behavior()`
- t5328: avoid top-level directory changes
- t5318: avoid top-level directory changes
- t/lib-commit-graph.sh: avoid directory change in `graph_git_behavior()`
- t/lib-commit-graph.sh: allow `graph_read_expect()` in sub-directories
Command line parser fixes.
Test updates.
Will merge to 'next'.
source: <xmqqh6pzc15n.fsf@gitster.g>
* jc/transport-parseopt-fix (2023-07-18) 2 commits
- fetch: reject --no-ipv[46]
- parse-options: introduce OPT_IPVERSION()
Command line parser fixes.
Will merge to 'next'.
source: <xmqqedl4gag8.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
- t1092: add tests for 'git check-attr'
Teach "git check-attr" work better with sparse-index.
Needs review.
source: <20230718232916.31660-1-cheskaqiqi@gmail.com>
Will merge to 'next'?
source: <cover.1690216758.git.me@ttaylorr.com>
--------------------------------------------------
[Stalled]
@ -470,21 +402,6 @@ Release tarballs are available at:
source: <20230120113553.24655-1-carenas@gmail.com>
* tk/pull-conflict-suggest-rebase-merge-not-rebase-true (2023-02-13) 1 commit
- pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
In an advice message after failed non-ff pull, we used to suggest
setting pull.rebase=true, but these days pull.rebase=merges may be
more inline with the original spirit of "rebuild your side on top
of theirs".
Will discard.
This is too much of a departure from the existing practice.
cf. <CAMMLpeTPEoKVTbfc17w+Y9qn7jOGmQi_Ux0Y3sFW5QTgGWJ=SA@mail.gmail.com>
cf. <CABPp-BGqAxKnxDRVN4cYMteLp33hvto07R3=TJBT5WubJT4+Og@mail.gmail.com>
source: <pull.1474.git.1675614276549.gitgitgadget@gmail.com>
* 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
@ -499,68 +416,6 @@ Release tarballs are available at:
source: <cover-v2-0.3-00000000000-20221230T011725Z-avarab@gmail.com>
* ad/test-record-count-when-harness-is-in-use (2022-12-25) 1 commit
- test-lib: allow storing counts with test harnesses
Allow summary results from tests to be written to t/test-results
directory even when a test harness like 'prove' is in use.
Will discard.
Have been expecting a reroll for too long.
cf. <CABPp-BGoPuGCZw+9wCgdYyRR4Zf4y9Kun27GrQhtMdYWpOUsYQ@mail.gmail.com>
source: <20221224225200.1027806-1-adam@dinwoodie.org>
* so/diff-merges-more (2022-12-18) 5 commits
- diff-merges: improve --diff-merges documentation
- diff-merges: issue warning on lone '-m' option
- diff-merges: support list of values for --diff-merges
- diff-merges: implement log.diffMerges-m-imply-p config
- diff-merges: implement [no-]hide option and log.diffMergesHide config
Assorted updates to "--diff-merges=X" option.
Will discard.
Breaking compatibility does not seem worth it.
source: <20221217132955.108542-1-sorganov@gmail.com>
* ab/imap-send-requires-curl (2023-02-02) 6 commits
- imap-send: correctly report "host" when using "tunnel"
- imap-send: remove old --no-curl codepath
- imap-send: make --curl no-optional
- imap-send: replace auto-probe libcurl with hard dependency
- imap-send doc: the imap.sslVerify is used with imap.tunnel
- imap-send: note "auth_method", not "host" on auth method failure
Give a hard dependency on cURL library to build "git imap-send",
and remove the code to interact with IMAP server without using cURL.
Will discard.
Have been expecting a reroll for too long.
The 'tunnel' part is still iffy.
cf. <230203.86bkmabfjr.gmgdl@evledraar.gmail.com>
source: <cover-v2-0.6-00000000000-20230202T093706Z-avarab@gmail.com>
* cw/submodule-status-in-parallel (2023-03-02) 6 commits
- diff-lib: parallelize run_diff_files for submodules
- diff-lib: refactor out diff_change logic
- submodule: refactor is_submodule_modified()
- submodule: move status parsing into function
- submodule: rename strbuf variable
- run-command: add on_stderr_output_fn to run_processes_parallel_opts
"git submodule status" learned to run the comparison in submodule
repositories in parallel.
Will discard.
Have been expecting a reroll for too long.
cf. <CAFySSZDk05m6gU5-V1R+y3YnQ5PPduVW54+_gjBwD0rmacsLsw@mail.gmail.com>
cf. <230307.865ybc273g.gmgdl@evledraar.gmail.com>
source: <20230302215237.1473444-1-calvinwan@google.com>
* ob/revert-of-revert (2023-05-05) 1 commit
- sequencer: beautify subject of reverts of reverts
@ -585,7 +440,8 @@ Release tarballs are available at:
Various fixes to the behaviour of "rebase -i" when the command got
interrupted by conflicting changes.
Expecting a reroll.
Will discard.
Have been expecting a reroll for too long.
cf. <xmqqsfcthrpb.fsf@gitster.g>
cf. <1fd54422-b66a-c2e4-7cd7-934ea01190ad@gmail.com>
cf. <55dd6194-25e5-1a66-9c39-27cb19bfbb3c@gmail.com>
@ -594,61 +450,160 @@ Release tarballs are available at:
--------------------------------------------------
[Cooking]
* 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
Clarify how to choose the starting point for a new topic in
developer guidance document.
Will merge to 'master'.
source: <pull.1556.v2.git.1689314493.gitgitgadget@gmail.com>
* jr/gitignore-doc-example-markup (2023-07-18) 1 commit
(merged to 'next' on 2023-07-19 at 4f2ece568d)
+ gitignore.txt: use backticks instead of double quotes
Doc update.
Will merge to 'master'.
source: <pull.1553.git.git.1689685982027.gitgitgadget@gmail.com>
* jc/am-parseopt-fix (2023-07-18) 1 commit
(merged to 'next' on 2023-07-19 at eaf592531e)
+ am: simplify parsing of "--[no-]keep-cr"
Code simplification.
Will merge to 'master'.
source: <xmqqr0p5gjv3.fsf@gitster.g>
* jc/branch-parseopt-fix (2023-07-18) 1 commit
(merged to 'next' on 2023-07-19 at 738d25bbb6)
+ branch: reject "--no-all" and "--no-remotes" early
Command line parser fixes.
Will merge to 'master'.
source: <xmqqjzuxgjmi.fsf@gitster.g>
* rs/ls-tree-no-full-name-fix (2023-07-18) 1 commit
(merged to 'next' on 2023-07-19 at 86e570c084)
+ ls-tree: fix --no-full-name
Command line parser fix.
Will merge to 'master'.
source: <d392a005-4eba-7cc7-9554-cdb8dc53975e@web.de>
* jc/doc-sent-patch-now-what (2023-07-19) 1 commit
- MyFirstContribution: refrain from self-iterating too much
Process document update.
Will merge to 'next'?
source: <xmqqzga9opdu.fsf@gitster.g>
* jc/gitignore-doc-pattern-markup (2023-07-18) 1 commit
(merged to 'next' on 2023-07-20 at ecfc9c6118)
+ gitignore.txt: mark up explanation of patterns consistently
Doc mark-up update.
Will merge to 'master'.
source: <xmqqwmyxglhg.fsf@gitster.g>
* jc/parse-options-reset (2023-07-19) 1 commit
(merged to 'next' on 2023-07-20 at d2178a4bd4)
+ reset: reject --no-(mixed|soft|hard|merge|keep) option
Command line parser fix.
Will merge to 'master'.
source: <xmqq1qh4c998.fsf@gitster.g>
* jc/parse-options-short-help (2023-07-19) 3 commits
- 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.
Comments?
source: <xmqq5y6gg8fn.fsf@gitster.g>
* jc/parse-options-show-branch (2023-07-19) 2 commits
(merged to 'next' on 2023-07-20 at 4fa809c2f2)
+ show-branch: reject --[no-](topo|date)-order
+ show-branch: --no-sparse should give dense output
Command line parser fixes.
Will merge to 'master'.
source: <xmqqh6pzc15n.fsf@gitster.g>
* jc/transport-parseopt-fix (2023-07-18) 2 commits
(merged to 'next' on 2023-07-20 at 07f0026aaa)
+ fetch: reject --no-ipv[46]
+ parse-options: introduce OPT_IPVERSION()
Command line parser fixes.
Will merge to 'master'.
source: <xmqqedl4gag8.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
- t1092: add tests for 'git check-attr'
Teach "git check-attr" work better with sparse-index.
Expecting a reroll.
cf. <c3ebe3b4-88b9-8ca2-2ee3-39a3e0d82201@github.com>
cf. <5e478d8b-9ef4-864b-41e4-e0a79877d278@github.com>
source: <20230718232916.31660-1-cheskaqiqi@gmail.com>
* ah/autoconf-fixes (2023-07-19) 3 commits
- 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
(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
"./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.
Needs review.
Will merge to 'master'.
source: <20230719145211.17854-2-aherrmann@suse.de>
* jc/branch-in-use-error-message (2023-07-12) 1 commit
. branch: update the message to refuse touching a branch in-use
* jc/branch-in-use-error-message (2023-07-21) 1 commit
- 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".
Just a weather-balloon.
source: <xmqqy1jkrcmg.fsf_-_@gitster.g>
* tb/object-access-overflow-protection (2023-07-14) 20 commits
(merged to 'next' on 2023-07-17 at 9ad8a08011)
+ commit-graph.c: prevent overflow in `verify_commit_graph()`
+ commit-graph.c: prevent overflow in `write_commit_graph()`
+ commit-graph.c: prevent overflow in `merge_commit_graph()`
+ commit-graph.c: prevent overflow in `split_graph_merge_strategy()`
+ commit-graph.c: prevent overflow in `load_tree_for_commit()`
+ commit-graph.c: prevent overflow in `fill_commit_in_graph()`
+ commit-graph.c: prevent overflow in `fill_commit_graph_info()`
+ commit-graph.c: prevent overflow in `load_oid_from_graph()`
+ commit-graph.c: prevent overflow in add_graph_to_chain()
+ commit-graph.c: prevent overflow in `write_commit_graph_file()`
+ pack-bitmap.c: ensure that eindex lookups don't overflow
+ midx.c: prevent overflow in `fill_included_packs_batch()`
+ midx.c: prevent overflow in `write_midx_internal()`
+ midx.c: store `nr`, `alloc` variables as `size_t`'s
+ midx.c: prevent overflow in `nth_midxed_offset()`
+ midx.c: prevent overflow in `nth_midxed_object_oid()`
+ midx.c: use `size_t`'s for fanout nr and alloc
+ packfile.c: use checked arithmetic in `nth_packed_object_offset()`
+ packfile.c: prevent overflow in `load_idx()`
+ packfile.c: prevent overflow in `nth_packed_object_id()`
Various offset computation in the code that accesses the packfiles
and other data in the object layer has been hardened against
arithmetic overflow, especially on 32-bit systems.
Will merge to 'master'.
source: <ZLAJNbIBFUPHYhlt@nand.local>
source: <cover.1689205042.git.me@ttaylorr.com>
Will merge to 'next'?
source: <xmqqr0p1szhz.fsf_-_@gitster.g>
* jc/doc-submodule-update-settings (2023-07-13) 1 commit
@ -657,32 +612,19 @@ Release tarballs are available at:
Rewrite the description of giving a custom command to the
submodule.<name>.update configuraiton variable.
Just a weather-balloon.
Expecting a reroll from the original author.
cf. <0d29ac42-4e8f-71b6-b85f-00de182e2957@imap.cc>
source: <xmqqwmz3oacg.fsf@gitster.g>
* ah/advise-force-pushing (2023-07-13) 3 commits
(merged to 'next' on 2023-07-17 at b040e8280e)
+ push: don't imply that integration is always required before pushing
+ remote: don't imply that integration is always required before pushing
+ wt-status: don't show divergence advice when committing
Help newbies by suggesting that there are cases where force-pushing
is a valid and sensible thing to update a branch at a remote
repository, rather than reconciling with merge/rebase.
Will merge to 'master'.
cf. <919d1ba8-bb8b-a77b-cef3-db14f168ed4a@gmail.com>
source: <20230713044128.3771818-1-alexhenrie24@gmail.com>
* jc/tree-walk-drop-base-offset (2023-07-07) 2 commits
- tree-walk: drop unused base_offset from do_match()
- tree-walk: lose base_offset that is never used in tree_entry_interesting
(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
Code simplification.
Needs review.
Will merge to 'master'.
source: <20230707222116.4129415-1-gitster@pobox.com>
@ -694,7 +636,7 @@ Release tarballs are available at:
source: <pull.1529.git.git.1687596777147.gitgitgadget@gmail.com>
* cc/repack-sift-filtered-objects-to-separate-pack (2023-07-05) 8 commits
* cc/repack-sift-filtered-objects-to-separate-pack (2023-07-24) 8 commits
- gc: add `gc.repackFilterTo` config option
- repack: implement `--filter-to` for storing filtered out objects
- gc: add `gc.repackFilter` config option
@ -707,9 +649,8 @@ Release tarballs are available at:
"git repack" machinery learns to pay attention to the "--filter="
option.
Comments?
cf. <xmqqh6qi1byn.fsf@gitster.g>
source: <20230705060812.2865188-1-christian.couder@gmail.com>
Will merge to 'next'.
source: <20230724085909.3831831-1-christian.couder@gmail.com>
* js/doc-unit-tests (2023-06-30) 1 commit
@ -721,20 +662,6 @@ Release tarballs are available at:
source: <0169ce6fb9ccafc089b74ae406db0d1a8ff8ac65.1688165272.git.steadmon@google.com>
* mh/mingw-case-sensitive-build (2023-06-12) 1 commit
(merged to 'next' on 2023-07-17 at 2c72856851)
+ mingw: use lowercase includes for some Windows headers
Names of MinGW header files are spelled in mixed case in some
source files, but the build host can be using case sensitive
filesystem with header files with their name spelled in all
lowercase.
Will merge to 'master'.
cf. <xmqqmt14a36k.fsf@gitster.g>
source: <20230604211934.1365289-1-mh@glandium.org>
* jt/path-filter-fix (2023-07-13) 4 commits
- commit-graph: new filter ver. that fixes murmur3
- repo-settings: introduce commitgraph.changedPathsVersion
@ -744,6 +671,9 @@ Release tarballs are available at:
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.
Expecting a reroll.
cf. <20230720202203.3816309-1-jonathantanmy@google.com>
source: <cover.1689283789.git.jonathantanmy@google.com>
@ -758,32 +688,6 @@ Release tarballs are available at:
source: <pull.1469.v5.git.git.1686945306242.gitgitgadget@gmail.com>
* tb/refs-exclusion-and-packed-refs (2023-07-10) 16 commits
(merged to 'next' on 2023-07-13 at 6d72f3e995)
+ ls-refs.c: avoid enumerating hidden refs where possible
+ upload-pack.c: avoid enumerating hidden refs where possible
+ builtin/receive-pack.c: avoid enumerating hidden references
+ refs.h: implement `hidden_refs_to_excludes()`
+ refs.h: let `for_each_namespaced_ref()` take excluded patterns
+ revision.h: store hidden refs in a `strvec`
+ refs/packed-backend.c: add trace2 counters for jump list
+ refs/packed-backend.c: implement jump lists to avoid excluded pattern(s)
+ refs/packed-backend.c: refactor `find_reference_location()`
+ refs: plumb `exclude_patterns` argument throughout
+ builtin/for-each-ref.c: add `--exclude` option
+ ref-filter.c: parameterize match functions over patterns
+ ref-filter: add `ref_filter_clear()`
+ ref-filter: clear reachable list pointers after freeing
+ ref-filter.h: provide `REF_FILTER_INIT`
+ refs.c: rename `ref_filter`
Enumerating refs in the packed-refs file, while excluding refs that
match certain patterns, has been optimized.
Will merge to 'master'.
source: <cover.1689023520.git.me@ttaylorr.com>
* cc/git-replay (2023-06-03) 15 commits
- replay: stop assuming replayed branches do not diverge
- replay: add --contained to rebase contained branches
@ -803,3 +707,14 @@ Release tarballs are available at:
What's the status of this thing?
source: <20230602102533.876905-1-christian.couder@gmail.com>
--------------------------------------------------
[Discarded]
* 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>