mirror of
https://github.com/git/git.git
synced 2026-04-02 13:00:08 +02:00
What's cooking (2023/02 #04)
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Feb 2023, #03; Tue, 14)
|
||||
X-master-at: c867e4fa180bec4750e9b54eb10f459030dbebfd
|
||||
X-next-at: 0c349d5c3e2f4fa3283bdb20107953df3ec27116
|
||||
Subject: What's cooking in git.git (Feb 2023, #04; Wed, 22)
|
||||
X-master-at: 06dd2baa8da4a73421b959ec026a43711b9d77f9
|
||||
X-next-at: 32e93fb2a9710edfb0503ec4c4616b77bd28bffe
|
||||
Bcc: lwn@lwn.net, gitster@pobox.com
|
||||
|
||||
What's cooking in git.git (Feb 2023, #03; Tue, 14)
|
||||
What's cooking in git.git (Feb 2023, #04; Wed, 22)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking in my tree. Commits
|
||||
@@ -14,10 +14,6 @@ release). Commits prefixed with '-' are only in 'seen', and aren't
|
||||
considered "accepted" at all. A topic without enough support may be
|
||||
discarded after a long period of no activity.
|
||||
|
||||
There are security releases, ranging from 2.30.8 to 2.39.2. The
|
||||
fixes in these releases have already been integrated to the 'master'
|
||||
branch as well.
|
||||
|
||||
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.
|
||||
@@ -47,7 +43,54 @@ Release tarballs are available at:
|
||||
https://www.kernel.org/pub/software/scm/git/
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
[Graduated to 'master']
|
||||
|
||||
* ab/config-h-remove-unused (2023-02-07) 1 commit
|
||||
(merged to 'next' on 2023-02-09 at fa83258b81)
|
||||
+ config.h: remove unused git_configset_add_parameters()
|
||||
|
||||
Code clean-up.
|
||||
source: <patch-1.1-31f4a08c068-20230207T161453Z-avarab@gmail.com>
|
||||
|
||||
|
||||
* ab/hook-api-with-stdin (2023-02-08) 5 commits
|
||||
(merged to 'next' on 2023-02-13 at 4cb74ecb6b)
|
||||
+ hook: support a --to-stdin=<path> option
|
||||
+ sequencer: use the new hook API for the simpler "post-rewrite" call
|
||||
+ hook API: support passing stdin to hooks, convert am's 'post-rewrite'
|
||||
+ run-command: allow stdin for run_processes_parallel
|
||||
+ run-command.c: remove dead assignment in while-loop
|
||||
|
||||
Extend the run-hooks API to allow feeding data from the standard
|
||||
input when running the hook script(s).
|
||||
source: <cover-v2-0.5-00000000000-20230208T191924Z-avarab@gmail.com>
|
||||
|
||||
|
||||
* ab/retire-scripted-add-p (2023-02-06) 3 commits
|
||||
(merged to 'next' on 2023-02-09 at 1b8c7bce7d)
|
||||
+ docs & comments: replace mentions of "git-add--interactive.perl"
|
||||
+ add API: remove run_add_interactive() wrapper function
|
||||
+ add: remove "add.interactive.useBuiltin" & Perl "git add--interactive"
|
||||
|
||||
Finally retire the scripted "git add -p/-i" implementation and have
|
||||
everybody use the one reimplemented in C.
|
||||
source: <cover-v2-0.3-00000000000-20230206T225639Z-avarab@gmail.com>
|
||||
|
||||
|
||||
* ab/sequencer-unleak (2023-02-06) 8 commits
|
||||
(merged to 'next' on 2023-02-09 at 98bff1953f)
|
||||
+ commit.c: free() revs.commit in get_fork_point()
|
||||
+ builtin/rebase.c: free() "options.strategy_opts"
|
||||
+ sequencer.c: always free() the "msgbuf" in do_pick_commit()
|
||||
+ builtin/rebase.c: fix "options.onto_name" leak
|
||||
+ builtin/revert.c: move free-ing of "revs" to replay_opts_release()
|
||||
+ sequencer API users: fix get_replay_opts() leaks
|
||||
+ sequencer.c: split up sequencer_remove_state()
|
||||
+ rebase: use "cleanup" pattern in do_interactive_rebase()
|
||||
|
||||
Plug leaks in sequencer subsystem and its users.
|
||||
source: <cover-v4-0.8-00000000000-20230206T190346Z-avarab@gmail.com>
|
||||
|
||||
|
||||
* ab/the-index-compatibility (2023-02-10) 6 commits
|
||||
(merged to 'next' on 2023-02-13 at 4f9869d4cf)
|
||||
@@ -60,19 +103,88 @@ Release tarballs are available at:
|
||||
|
||||
Remove more remaining uses of macros that relies on the_index
|
||||
singleton instance without explicitly spelling it out.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <cover-v2-0.6-00000000000-20230210T102114Z-avarab@gmail.com>
|
||||
|
||||
|
||||
* rs/cache-tree-strbuf-growth-fix (2023-02-10) 1 commit
|
||||
(merged to 'next' on 2023-02-13 at fd9ae8790b)
|
||||
+ cache-tree: fix strbuf growth in prime_cache_tree_rec()
|
||||
* ab/various-leak-fixes (2023-02-06) 19 commits
|
||||
(merged to 'next' on 2023-02-13 at 0cee9746f7)
|
||||
+ push: free_refs() the "local_refs" in set_refspecs()
|
||||
+ push: refactor refspec_append_mapped() for subsequent leak-fix
|
||||
+ receive-pack: release the linked "struct command *" list
|
||||
+ grep API: plug memory leaks by freeing "header_list"
|
||||
+ grep.c: refactor free_grep_patterns()
|
||||
+ builtin/merge.c: free "&buf" on "Your local changes..." error
|
||||
+ builtin/merge.c: use fixed strings, not "strbuf", fix leak
|
||||
+ show-branch: free() allocated "head" before return
|
||||
+ commit-graph: fix a parse_options_concat() leak
|
||||
+ http-backend.c: fix cmd_main() memory leak, refactor reg{exec,free}()
|
||||
+ http-backend.c: fix "dir" and "cmd_arg" leaks in cmd_main()
|
||||
+ worktree: fix a trivial leak in prune_worktrees()
|
||||
+ repack: fix leaks on error with "goto cleanup"
|
||||
+ name-rev: don't xstrdup() an already dup'd string
|
||||
+ various: add missing clear_pathspec(), fix leaks
|
||||
+ clone: use free() instead of UNLEAK()
|
||||
+ commit-graph: use free_commit_graph() instead of UNLEAK()
|
||||
+ bundle.c: don't leak the "args" in the "struct child_process"
|
||||
+ tests: mark tests as passing with SANITIZE=leak
|
||||
|
||||
Remove unnecessary explicit sizing of strbuf.
|
||||
Leak fixes.
|
||||
source: <cover-v7-00.19-00000000000-20230206T230141Z-avarab@gmail.com>
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <a37623c8-d2fb-aec6-3423-2d402d717959@web.de>
|
||||
|
||||
* ar/userdiff-java-update (2023-02-08) 3 commits
|
||||
(merged to 'next' on 2023-02-09 at f62497382a)
|
||||
+ userdiff: support Java sealed classes
|
||||
+ userdiff: support Java record types
|
||||
+ userdiff: support Java type parameters
|
||||
|
||||
Userdiff regexp update for Java language.
|
||||
source: <20230207234259.452141-1-rybak.a.v@gmail.com>
|
||||
|
||||
|
||||
* cb/grep-fallback-failing-jit (2023-01-31) 1 commit
|
||||
(merged to 'next' on 2023-02-08 at 3a70d6ef6c)
|
||||
+ grep: fall back to interpreter if JIT memory allocation fails
|
||||
|
||||
In an environment where dynamically generated code is prohibited to
|
||||
run (e.g. SELinux), failure to JIT pcre patterns is expected. Fall
|
||||
back to interpreted execution in such a case.
|
||||
source: <20230131185611.520311-1-minipli@grsecurity.net>
|
||||
|
||||
|
||||
* cw/doc-pushurl-vs-url (2023-02-07) 1 commit
|
||||
(merged to 'next' on 2023-02-09 at 21b0678d19)
|
||||
+ Documentation: clarify multiple pushurls vs urls
|
||||
|
||||
Doc update.
|
||||
source: <20230207181227.361290-1-calvinwan@google.com>
|
||||
|
||||
|
||||
* ds/bundle-uri-5 (2023-01-31) 11 commits
|
||||
(merged to 'next' on 2023-02-08 at 1ba9ba565d)
|
||||
+ bundle-uri: test missing bundles with heuristic
|
||||
+ bundle-uri: store fetch.bundleCreationToken
|
||||
+ fetch: fetch from an external bundle URI
|
||||
+ bundle-uri: drop bundle.flag from design doc
|
||||
+ clone: set fetch.bundleURI if appropriate
|
||||
+ bundle-uri: download in creationToken order
|
||||
+ bundle-uri: parse bundle.<id>.creationToken values
|
||||
+ bundle-uri: parse bundle.heuristic=creationToken
|
||||
+ t5558: add tests for creationToken heuristic
|
||||
+ bundle: verify using check_connected()
|
||||
+ bundle: test unbundling with incomplete history
|
||||
|
||||
The bundle-URI subsystem adds support for creation-token heuristics
|
||||
to help incremental fetches.
|
||||
source: <pull.1454.v3.git.1675171759.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* en/name-rev-make-taggerdate-much-less-important (2023-02-09) 1 commit
|
||||
(merged to 'next' on 2023-02-10 at 059bc956aa)
|
||||
+ name-rev: fix names by dropping taggerdate workaround
|
||||
|
||||
"git name-rev" heuristics update.
|
||||
source: <pull.1468.v3.git.1675933906906.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* jk/doc-ls-remote-matching (2023-02-10) 2 commits
|
||||
@@ -81,47 +193,212 @@ Release tarballs are available at:
|
||||
+ doc/ls-remote: cosmetic cleanups for examples
|
||||
|
||||
Doc update.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <Y+cAdZTs5y0yiTkM@coredump.intra.peff.net>
|
||||
|
||||
|
||||
* ew/commit-reach-clean-up-flags-fix (2023-02-11) 1 commit
|
||||
- commit-reach: avoid NULL dereference
|
||||
* kf/t5000-modernise (2023-02-06) 1 commit
|
||||
(merged to 'next' on 2023-02-09 at 0341c54639)
|
||||
+ t5000: modernise archive and :(glob) test
|
||||
|
||||
Under discussion.
|
||||
cf. <876cf920-113a-90cf-f49e-6e1b7b146acf@github.com>
|
||||
source: <20230211111526.2028178-1-e@80x24.org>
|
||||
Test clean-up.
|
||||
source: <20230204204124.80741-1-kostya.farber@gmail.com>
|
||||
|
||||
|
||||
* rs/ctype-test (2023-02-13) 3 commits
|
||||
- test-ctype: test iscntrl, ispunct, isxdigit and isprint
|
||||
- test-ctype: test islower and isupper
|
||||
- test-ctype: test isascii
|
||||
* po/attributes-text (2023-02-06) 1 commit
|
||||
(merged to 'next' on 2023-02-09 at 8be7b134da)
|
||||
+ .gitattributes: include `text` attribute for eol attributes
|
||||
|
||||
Test safe_ctype
|
||||
|
||||
Will merge to 'next'.
|
||||
source: <81eee04b-598e-dfe1-f954-3105bcbcb2f2@web.de>
|
||||
In-tree .gitattributes update to match the way we recommend our
|
||||
users to mark a file as text.
|
||||
source: <20230203125920.751-1-philipoakley@iee.email>
|
||||
|
||||
|
||||
* mh/credential-password-expiry (2023-02-13) 1 commit
|
||||
. credential: new attribute password_expiry_utc
|
||||
* rs/cache-tree-strbuf-growth-fix (2023-02-10) 1 commit
|
||||
(merged to 'next' on 2023-02-13 at fd9ae8790b)
|
||||
+ cache-tree: fix strbuf growth in prime_cache_tree_rec()
|
||||
|
||||
Seems to break CI only on Windows?
|
||||
cf. https://github.com/git/git/actions/runs/4169057114/jobs/7217377625
|
||||
source: <pull.1443.v3.git.git.1675545372271.gitgitgadget@gmail.com>
|
||||
Remove unnecessary explicit sizing of strbuf.
|
||||
source: <a37623c8-d2fb-aec6-3423-2d402d717959@web.de>
|
||||
|
||||
|
||||
* 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"
|
||||
* rs/size-t-fixes (2023-02-06) 2 commits
|
||||
(merged to 'next' on 2023-02-09 at 4bf6998479)
|
||||
+ pack-objects: use strcspn(3) in name_cmp_len()
|
||||
+ read-cache: use size_t for {base,df}_name_compare()
|
||||
|
||||
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".
|
||||
Type fixes.
|
||||
source: <7315487c-c97c-b8a2-d3b2-4fbf642495dd@web.de>
|
||||
|
||||
source: <pull.1474.git.1675614276549.gitgitgadget@gmail.com>
|
||||
|
||||
* wl/new-command-doc (2023-02-06) 1 commit
|
||||
(merged to 'next' on 2023-02-09 at 23bcd4d4d9)
|
||||
+ new-command.txt: update reference to builtin docs
|
||||
|
||||
Comment fix.
|
||||
source: <pull.1451.git.git.1675477659972.gitgitgadget@gmail.com>
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jc/diff-algo-attribute (2023-02-21) 2 commits
|
||||
(merged to 'next' on 2023-02-22 at 2375640330)
|
||||
+ diff: teach diff to read algorithm from diff driver
|
||||
+ diff: consolidate diff algorithm option parsing
|
||||
|
||||
The "diff" drivers specified by the "diff" attribute attached to
|
||||
paths can now specify which algorithm (e.g. histogram) to use.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <pull.1452.v4.git.git.1676927082.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* jk/shorten-unambiguous-ref-wo-sscanf (2023-02-15) 3 commits
|
||||
- shorten_unambiguous_ref(): avoid sscanf()
|
||||
- shorten_unambiguous_ref(): use NUM_REV_PARSE_RULES constant
|
||||
- shorten_unambiguous_ref(): avoid integer truncation
|
||||
|
||||
sscanf(3) used in "git symbolic-ref --short" implementation found
|
||||
to be not working reliably on macOS in UTF-8 locales. Rewrite the
|
||||
code to avoid sscanf() altogether to work it around.
|
||||
|
||||
Will merge to 'next'?
|
||||
source: <Y+z3MtgayoXsxaHA@coredump.intra.peff.net>
|
||||
|
||||
|
||||
* js/gpg-errors (2023-02-15) 2 commits
|
||||
(merged to 'next' on 2023-02-16 at 510898ff10)
|
||||
+ gpg: do show gpg's error message upon failure
|
||||
+ t7510: add a test case that does not need gpg
|
||||
|
||||
Error messages given upon a signature verification failure used to
|
||||
discard the errors from underlying gpg program, which has been
|
||||
corrected.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <pull.1480.git.1676440714.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* jc/genzeros-avoid-raw-write (2023-02-16) 1 commit
|
||||
(merged to 'next' on 2023-02-22 at a60fe69bce)
|
||||
+ test-genzeros: avoid raw write(2)
|
||||
|
||||
A test helper had a single write(2) of 256kB, which was too big for
|
||||
some platforms (e.g. NonStop), which has been corrected by using
|
||||
xwrite() wrapper appropriately.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <xmqqo7putj1t.fsf_-_@gitster.g>
|
||||
|
||||
|
||||
* jk/http-proxy-tests (2023-02-16) 1 commit
|
||||
(merged to 'next' on 2023-02-22 at f1f69d188f)
|
||||
+ add basic http proxy tests
|
||||
|
||||
Test updates.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <Y+6YgALh6L9m6rSX@coredump.intra.peff.net>
|
||||
|
||||
|
||||
* ps/free-island-marks (2023-02-21) 1 commit
|
||||
(merged to 'next' on 2023-02-22 at f46938bce3)
|
||||
+ delta-islands: fix segfault when freeing island marks
|
||||
|
||||
Fix on a previous fix already in 'master'.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <61e490595b80b34c55fd640e093e021ff6fa9591.1676542973.git.ps@pks.im>
|
||||
|
||||
|
||||
* tb/drop-dir-iterator-follow-symlink-bit (2023-02-16) 2 commits
|
||||
(merged to 'next' on 2023-02-22 at 785e1f323e)
|
||||
+ t0066: drop setup of "dir5"
|
||||
+ dir-iterator: drop unused `DIR_ITERATOR_FOLLOW_SYMLINKS`
|
||||
|
||||
Remove leftover and unused code.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <9bb10b607e46f867a3f8f5c71abf13c990d1ecfe.1676572031.git.me@ttaylorr.com>
|
||||
source: <CAGdrTFhHBU2BNYdYr7LbOS7i1LOHGjWLw_d5ZJAXxvTKyLiFCA@mail.gmail.com>
|
||||
|
||||
|
||||
* jc/countermand-format-attach (2023-02-17) 1 commit
|
||||
- format.attach: allow empty value to disable multi-part messages
|
||||
|
||||
The format.attach configuration variable lacked a way to override a
|
||||
value defined in a lower-priority configuration file (e.g. the
|
||||
system one) by redefining it in a higher-priority configuration
|
||||
file. Now, setting format.attach to an empty string means show the
|
||||
patch inline in the e-mail message, without using MIME attachment.
|
||||
|
||||
This is a backward incompatible change.
|
||||
|
||||
Will merge to 'next'?
|
||||
source: <xmqqwn4fkgtq.fsf@gitster.g>
|
||||
|
||||
|
||||
* rs/archive-mtime (2023-02-18) 1 commit
|
||||
- archive: add --mtime
|
||||
|
||||
"git archive HEAD^{tree}" records the paths with the current
|
||||
timestamp in the archive, making it harder to obtain a stable
|
||||
output. The command learned the --mtime option to specify an
|
||||
arbitrary timestamp (e.g. --mtime="@0 +0000" for the epoch).
|
||||
|
||||
Will merge to 'next'?
|
||||
source: <91a73f5d-ca3e-6cb0-4ba3-38d703074ee6@web.de>
|
||||
|
||||
|
||||
* ap/t2015-style-update (2023-02-21) 1 commit
|
||||
(merged to 'next' on 2023-02-22 at 40883b85c7)
|
||||
+ t2015-checkout-unborn.sh: changes the style for cd
|
||||
|
||||
Test clean-up.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <20230218192128.7963-1-ashutosh.pandeyhlr007@gmail.com>
|
||||
|
||||
|
||||
* if/simplify-trace-setup (2023-02-21) 1 commit
|
||||
- trace.c, git.c: remove unnecessary parameter to trace_repo_setup()
|
||||
|
||||
Code clean-up.
|
||||
|
||||
Will merge to 'next'?
|
||||
source: <20230219002527.84315-1-mcsm224@gmail.com>
|
||||
|
||||
|
||||
* ma/fetch-parallel-use-online-cpus (2023-02-21) 1 commit
|
||||
(merged to 'next' on 2023-02-22 at 756d379bf0)
|
||||
+ fetch: choose a sensible default with --jobs=0 again
|
||||
|
||||
"git fetch --jobs=0" used to hit a BUG(), which has been corrected
|
||||
to use the available CPUs.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <pull.1483.git.1676928805555.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* pw/rebase-i-validate-labels-early (2023-02-21) 1 commit
|
||||
(merged to 'next' on 2023-02-22 at 9b37d42d24)
|
||||
+ rebase -i: check labels and refs when parsing todo list
|
||||
|
||||
An invalid label or ref in the "rebase -i" todo file used to
|
||||
trigger an runtime error. SUch an error is now diagnosed while the
|
||||
todo file is parsed.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <pull.1482.v2.git.1676902774366.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* tl/range-diff-custom-abbrev (2023-02-21) 1 commit
|
||||
(merged to 'next' on 2023-02-22 at 49db7cce13)
|
||||
+ range-diff: let '--abbrev' option takes effect
|
||||
|
||||
"git range-diff" learned --abbrev=<num> option.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <20230220142444.18739-2-tenglong.tl@alibaba-inc.com>
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
@@ -140,19 +417,14 @@ Release tarballs are available at:
|
||||
source: <20230109173227.29264-1-jacobabel@nullpo.dev>
|
||||
|
||||
|
||||
* tl/notes--blankline (2022-11-09) 5 commits
|
||||
- notes.c: introduce "--no-blank-line" option
|
||||
- notes.c: provide tips when target and append note are both empty
|
||||
- notes.c: drop unreachable code in 'append_edit()'
|
||||
- notes.c: cleanup for "designated init" and "char ptr init"
|
||||
* tl/notes--blankline (2023-02-16) 3 commits
|
||||
- notes.c: introduce "--separator" option
|
||||
- notes.c: cleanup for "designated init"
|
||||
- notes.c: cleanup 'strbuf_grow' call in 'append_edit'
|
||||
|
||||
'git notes append' was taught '--[no-]blank-line' to conditionally
|
||||
add a LF between a new and existing note.
|
||||
|
||||
Expecting a reroll.
|
||||
cf. <CAPig+cRcezSp4Rqt1Y9bD-FT6+7b0g9qHfbGRx65AOnw2FQXKg@mail.gmail.com>
|
||||
source: <cover.1667980450.git.dyroneteng@gmail.com>
|
||||
'git notes append' was taught '--separator' to specify string to insert
|
||||
between paragraphs.
|
||||
source: <cover.1676551077.git.dyroneteng@gmail.com>
|
||||
|
||||
|
||||
* ab/tag-object-type-errors (2022-11-22) 5 commits
|
||||
@@ -219,101 +491,46 @@ Release tarballs are available at:
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* ab/config-h-remove-unused (2023-02-07) 1 commit
|
||||
(merged to 'next' on 2023-02-09 at fa83258b81)
|
||||
+ config.h: remove unused git_configset_add_parameters()
|
||||
* ew/commit-reach-clean-up-flags-fix (2023-02-11) 1 commit
|
||||
- commit-reach: avoid NULL dereference
|
||||
|
||||
Code clean-up.
|
||||
Under discussion.
|
||||
cf. <876cf920-113a-90cf-f49e-6e1b7b146acf@github.com>
|
||||
source: <20230211111526.2028178-1-e@80x24.org>
|
||||
|
||||
|
||||
* rs/ctype-test (2023-02-13) 3 commits
|
||||
(merged to 'next' on 2023-02-15 at 279f198dec)
|
||||
+ test-ctype: test iscntrl, ispunct, isxdigit and isprint
|
||||
+ test-ctype: test islower and isupper
|
||||
+ test-ctype: test isascii
|
||||
|
||||
Test safe_ctype
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <patch-1.1-31f4a08c068-20230207T161453Z-avarab@gmail.com>
|
||||
source: <81eee04b-598e-dfe1-f954-3105bcbcb2f2@web.de>
|
||||
|
||||
|
||||
* ab/retire-scripted-add-p (2023-02-06) 3 commits
|
||||
(merged to 'next' on 2023-02-09 at 1b8c7bce7d)
|
||||
+ docs & comments: replace mentions of "git-add--interactive.perl"
|
||||
+ add API: remove run_add_interactive() wrapper function
|
||||
+ add: remove "add.interactive.useBuiltin" & Perl "git add--interactive"
|
||||
* mh/credential-password-expiry (2023-02-18) 1 commit
|
||||
- credential: new attribute password_expiry_utc
|
||||
|
||||
Finally retire the scripted "git add -p/-i" implementation and have
|
||||
everybody use the one reimplemented in C.
|
||||
The credential subsystem learned that a password may have an
|
||||
explicit expiration.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <cover-v2-0.3-00000000000-20230206T225639Z-avarab@gmail.com>
|
||||
Will merge to 'next'?
|
||||
source: <pull.1443.v4.git.git.1676701977347.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* ar/userdiff-java-update (2023-02-08) 3 commits
|
||||
(merged to 'next' on 2023-02-09 at f62497382a)
|
||||
+ userdiff: support Java sealed classes
|
||||
+ userdiff: support Java record types
|
||||
+ userdiff: support Java type parameters
|
||||
* 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"
|
||||
|
||||
Userdiff regexp update for Java language.
|
||||
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 merge to 'master'.
|
||||
source: <20230207234259.452141-1-rybak.a.v@gmail.com>
|
||||
|
||||
|
||||
* cw/doc-pushurl-vs-url (2023-02-07) 1 commit
|
||||
(merged to 'next' on 2023-02-09 at 21b0678d19)
|
||||
+ Documentation: clarify multiple pushurls vs urls
|
||||
|
||||
Doc update.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <20230207181227.361290-1-calvinwan@google.com>
|
||||
|
||||
|
||||
* en/name-rev-make-taggerdate-much-less-important (2023-02-09) 1 commit
|
||||
(merged to 'next' on 2023-02-10 at 059bc956aa)
|
||||
+ name-rev: fix names by dropping taggerdate workaround
|
||||
|
||||
"git name-rev" heuristics update.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <pull.1468.v3.git.1675933906906.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* kf/t5000-modernise (2023-02-06) 1 commit
|
||||
(merged to 'next' on 2023-02-09 at 0341c54639)
|
||||
+ t5000: modernise archive and :(glob) test
|
||||
|
||||
Test clean-up.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <20230204204124.80741-1-kostya.farber@gmail.com>
|
||||
|
||||
|
||||
* po/attributes-text (2023-02-06) 1 commit
|
||||
(merged to 'next' on 2023-02-09 at 8be7b134da)
|
||||
+ .gitattributes: include `text` attribute for eol attributes
|
||||
|
||||
In-tree .gitattributes update to match the way we recommend our
|
||||
users to mark a file as text.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <20230203125920.751-1-philipoakley@iee.email>
|
||||
|
||||
|
||||
* rs/size-t-fixes (2023-02-06) 2 commits
|
||||
(merged to 'next' on 2023-02-09 at 4bf6998479)
|
||||
+ pack-objects: use strcspn(3) in name_cmp_len()
|
||||
+ read-cache: use size_t for {base,df}_name_compare()
|
||||
|
||||
Type fixes.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <7315487c-c97c-b8a2-d3b2-4fbf642495dd@web.de>
|
||||
|
||||
|
||||
* wl/new-command-doc (2023-02-06) 1 commit
|
||||
(merged to 'next' on 2023-02-09 at 23bcd4d4d9)
|
||||
+ new-command.txt: update reference to builtin docs
|
||||
|
||||
Comment fix.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <pull.1451.git.git.1675477659972.gitgitgadget@gmail.com>
|
||||
cf. <CAMMLpeTPEoKVTbfc17w+Y9qn7jOGmQi_Ux0Y3sFW5QTgGWJ=SA@mail.gmail.com>
|
||||
source: <pull.1474.git.1675614276549.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* jc/gpg-lazy-init (2023-02-09) 1 commit
|
||||
@@ -322,10 +539,12 @@ Release tarballs are available at:
|
||||
Instead of forcing each command to choose to honor GPG related
|
||||
configuration variables, make the subsystem lazily initialize
|
||||
itself.
|
||||
|
||||
Will merge to 'next'?
|
||||
source: <xmqqpmaimvtd.fsf_-_@gitster.g>
|
||||
|
||||
|
||||
* mc/credential-helper-www-authenticate (2023-02-08) 3 commits
|
||||
* mc/credential-helper-www-authenticate (2023-02-16) 3 commits
|
||||
- credential: add WWW-Authenticate header to cred requests
|
||||
- http: read HTTP WWW-Authenticate response headers
|
||||
- t5563: add tests for basic and anoymous HTTP access
|
||||
@@ -333,9 +552,8 @@ Release tarballs are available at:
|
||||
Allow information carried on the WWW-AUthenticate header to be
|
||||
passed to the credential helpers.
|
||||
|
||||
Expecting a (hopefully minor and final) reroll.
|
||||
cf. <9012b8a3-4abe-d3c6-41ee-f28931869ad7@github.com>
|
||||
source: <pull.1352.v8.git.1675711789.gitgitgadget@gmail.com>
|
||||
Will merge to 'next'?
|
||||
source: <pull.1352.v10.git.1676586881.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* ab/avoid-losing-exit-codes-in-tests (2023-02-06) 6 commits
|
||||
@@ -347,6 +565,8 @@ Release tarballs are available at:
|
||||
- auto-crlf tests: don't lose exit code in loops and outside tests
|
||||
|
||||
Test clean-up.
|
||||
|
||||
Will merge to 'next'?
|
||||
source: <cover-v5-0.6-00000000000-20230206T224200Z-avarab@gmail.com>
|
||||
|
||||
|
||||
@@ -358,6 +578,7 @@ Release tarballs are available at:
|
||||
Error messages given when working on an unborn branch that is
|
||||
checked out in another worktree have been improvved.
|
||||
|
||||
Expecting a reroll.
|
||||
cf. <230207.86cz6l501v.gmgdl@evledraar.gmail.com>
|
||||
source: <2193a4ed-b263-068e-92f8-847dcb053f8c@gmail.com>
|
||||
|
||||
@@ -373,16 +594,20 @@ Release tarballs are available at:
|
||||
Give a hard dependency on cURL library to build "git imap-send",
|
||||
and remove the code to interact with IMAP server without using cURL.
|
||||
|
||||
Expecting a reroll.
|
||||
The 'tunnel' part is still iffy.
|
||||
cf. <230203.86bkmabfjr.gmgdl@evledraar.gmail.com>
|
||||
source: <cover-v2-0.6-00000000000-20230202T093706Z-avarab@gmail.com>
|
||||
|
||||
|
||||
* rd/doc-default-date-format (2023-02-01) 1 commit
|
||||
- rev-list: clarify git-log default date format
|
||||
* rd/doc-default-date-format (2023-02-15) 1 commit
|
||||
(merged to 'next' on 2023-02-22 at 3818705ca9)
|
||||
+ rev-list: clarify git-log default date format
|
||||
|
||||
Update --date=default documentation.
|
||||
source: <20230201155712.86577-1-rafael@dulfer.be>
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <xmqqcz6av3ta.fsf_-_@gitster.g>
|
||||
|
||||
|
||||
* ab/config-multi-and-nonbool (2023-02-07) 10 commits
|
||||
@@ -398,36 +623,11 @@ Release tarballs are available at:
|
||||
- config tests: cover blind spots in git_die_config() tests
|
||||
|
||||
Assorted config API updates.
|
||||
|
||||
Will merge to 'next'?
|
||||
source: <cover-v5-00.10-00000000000-20230207T154000Z-avarab@gmail.com>
|
||||
|
||||
|
||||
* ab/hook-api-with-stdin (2023-02-08) 5 commits
|
||||
(merged to 'next' on 2023-02-13 at 4cb74ecb6b)
|
||||
+ hook: support a --to-stdin=<path> option
|
||||
+ sequencer: use the new hook API for the simpler "post-rewrite" call
|
||||
+ hook API: support passing stdin to hooks, convert am's 'post-rewrite'
|
||||
+ run-command: allow stdin for run_processes_parallel
|
||||
+ run-command.c: remove dead assignment in while-loop
|
||||
|
||||
Extend the run-hooks API to allow feeding data from the standard
|
||||
input when running the hook script(s).
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <cover-v2-0.5-00000000000-20230208T191924Z-avarab@gmail.com>
|
||||
|
||||
|
||||
* cb/grep-fallback-failing-jit (2023-01-31) 1 commit
|
||||
(merged to 'next' on 2023-02-08 at 3a70d6ef6c)
|
||||
+ grep: fall back to interpreter if JIT memory allocation fails
|
||||
|
||||
In an environment where dynamically generated code is prohibited to
|
||||
run (e.g. SELinux), failure to JIT pcre patterns is expected. Fall
|
||||
back to interpreted execution in such a case.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <20230131185611.520311-1-minipli@grsecurity.net>
|
||||
|
||||
|
||||
* cb/checkout-same-branch-twice (2023-01-20) 1 commit
|
||||
- checkout/switch: disallow checking out same branch in multiple worktrees
|
||||
|
||||
@@ -439,23 +639,6 @@ Release tarballs are available at:
|
||||
source: <20230120113553.24655-1-carenas@gmail.com>
|
||||
|
||||
|
||||
* ab/sequencer-unleak (2023-02-06) 8 commits
|
||||
(merged to 'next' on 2023-02-09 at 98bff1953f)
|
||||
+ commit.c: free() revs.commit in get_fork_point()
|
||||
+ builtin/rebase.c: free() "options.strategy_opts"
|
||||
+ sequencer.c: always free() the "msgbuf" in do_pick_commit()
|
||||
+ builtin/rebase.c: fix "options.onto_name" leak
|
||||
+ builtin/revert.c: move free-ing of "revs" to replay_opts_release()
|
||||
+ sequencer API users: fix get_replay_opts() leaks
|
||||
+ sequencer.c: split up sequencer_remove_state()
|
||||
+ rebase: use "cleanup" pattern in do_interactive_rebase()
|
||||
|
||||
Plug leaks in sequencer subsystem and its users.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <cover-v4-0.8-00000000000-20230206T190346Z-avarab@gmail.com>
|
||||
|
||||
|
||||
* rj/avoid-switching-to-already-used-branch (2023-01-22) 3 commits
|
||||
- switch: reject if the branch is already checked out elsewhere (test)
|
||||
- rebase: refuse to switch to a branch already checked out elsewhere (test)
|
||||
@@ -477,8 +660,7 @@ Release tarballs are available at:
|
||||
the original one) even when the branch is already checked out in a
|
||||
different worktree linked to the same repository.
|
||||
|
||||
Leaning negative. Why is it a good thing?
|
||||
cf. <xmqqo7qqovp1.fsf@gitster.g>
|
||||
Will merge to 'next'?
|
||||
source: <1c36c334-9f10-3859-c92f-3d889e226769@gmail.com>
|
||||
|
||||
|
||||
@@ -494,27 +676,6 @@ Release tarballs are available at:
|
||||
source: <20230120012459.920932-1-michael.strawbridge@amd.com>
|
||||
|
||||
|
||||
* ds/bundle-uri-5 (2023-01-31) 11 commits
|
||||
(merged to 'next' on 2023-02-08 at 1ba9ba565d)
|
||||
+ bundle-uri: test missing bundles with heuristic
|
||||
+ bundle-uri: store fetch.bundleCreationToken
|
||||
+ fetch: fetch from an external bundle URI
|
||||
+ bundle-uri: drop bundle.flag from design doc
|
||||
+ clone: set fetch.bundleURI if appropriate
|
||||
+ bundle-uri: download in creationToken order
|
||||
+ bundle-uri: parse bundle.<id>.creationToken values
|
||||
+ bundle-uri: parse bundle.heuristic=creationToken
|
||||
+ t5558: add tests for creationToken heuristic
|
||||
+ bundle: verify using check_connected()
|
||||
+ bundle: test unbundling with incomplete history
|
||||
|
||||
The bundle-URI subsystem adds support for creation-token heuristics
|
||||
to help incremental fetches.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <pull.1454.v3.git.1675171759.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* tc/cat-file-z-use-cquote (2023-01-16) 1 commit
|
||||
- cat-file: quote-format name in error when using -z
|
||||
|
||||
@@ -541,34 +702,6 @@ Release tarballs are available at:
|
||||
Not quite there yet...
|
||||
source: <20230209000212.1892457-1-calvinwan@google.com>
|
||||
|
||||
|
||||
* ab/various-leak-fixes (2023-02-06) 19 commits
|
||||
(merged to 'next' on 2023-02-13 at 0cee9746f7)
|
||||
+ push: free_refs() the "local_refs" in set_refspecs()
|
||||
+ push: refactor refspec_append_mapped() for subsequent leak-fix
|
||||
+ receive-pack: release the linked "struct command *" list
|
||||
+ grep API: plug memory leaks by freeing "header_list"
|
||||
+ grep.c: refactor free_grep_patterns()
|
||||
+ builtin/merge.c: free "&buf" on "Your local changes..." error
|
||||
+ builtin/merge.c: use fixed strings, not "strbuf", fix leak
|
||||
+ show-branch: free() allocated "head" before return
|
||||
+ commit-graph: fix a parse_options_concat() leak
|
||||
+ http-backend.c: fix cmd_main() memory leak, refactor reg{exec,free}()
|
||||
+ http-backend.c: fix "dir" and "cmd_arg" leaks in cmd_main()
|
||||
+ worktree: fix a trivial leak in prune_worktrees()
|
||||
+ repack: fix leaks on error with "goto cleanup"
|
||||
+ name-rev: don't xstrdup() an already dup'd string
|
||||
+ various: add missing clear_pathspec(), fix leaks
|
||||
+ clone: use free() instead of UNLEAK()
|
||||
+ commit-graph: use free_commit_graph() instead of UNLEAK()
|
||||
+ bundle.c: don't leak the "args" in the "struct child_process"
|
||||
+ tests: mark tests as passing with SANITIZE=leak
|
||||
|
||||
Leak fixes.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <cover-v7-00.19-00000000000-20230206T230141Z-avarab@gmail.com>
|
||||
|
||||
--------------------------------------------------
|
||||
[Discarded]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user