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/01 #03)

Browse Source
This commit is contained in:
Junio C Hamano 2023-01-09 20:52:26 +09:00
parent 7cedea4086
commit 64efb121ec
1 changed files with 233 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

437
whats-cooking.txt
View File

@ -1,10 +1,10 @@
To: git@vger.kernel.org
Subject: What's cooking in git.git (Jan 2023, #02; Fri, 6)
X-master-at: 4dbebc36b0893f5094668ddea077d0e235560b16
X-next-at: 2a6d74b5839c13a139e2856e92b7bd8110056098
Subject: What's cooking in git.git (Jan 2023, #03; Mon, 9)
X-master-at: a38d39a4c50d1275833aba54c4dbdfce9e2e9ca1
X-next-at: 19cc3de33e2ecf9e71de376dc7271792f26fb258
Bcc: lwn@lwn.net, gitster@pobox.com
What's cooking in git.git (Jan 2023, #02; Fri, 6)
What's cooking in git.git (Jan 2023, #03; Mon, 9)
--------------------------------------------------
Here are the topics that have been cooking in my tree. Commits
@ -14,6 +14,10 @@ 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.
A handful of topics have graduated to 'master'. On 'seen', there
are many topics accumulated that need reviews and review responses.
I'll be offline for a few days and will reappear later this week.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into or their mirrors. Some
repositories have only a subset of branches.
@ -45,170 +49,144 @@ Release tarballs are available at:
--------------------------------------------------
[Graduated to 'master']
* ab/bundle-wo-args (2022-12-28) 3 commits
(merged to 'next' on 2022-12-28 at 6ae8fc1c88)
+ bundle <cmd>: have usage_msg_opt() note the missing "<file>"
+ builtin/bundle.c: remove superfluous "newargc" variable
(merged to 'next' on 2022-12-26 at b086677fd0)
+ bundle: don't segfault on "git bundle <subcmd>"
* cw/ci-whitespace (2022-12-20) 3 commits
(merged to 'next' on 2023-01-05 at d3dc35f08c)
+ ci (check-whitespace): move to actions/checkout@v3
+ ci (check-whitespace): add links to job output
+ ci (check-whitespace): suggest fixes for errors
Fix to a small regression in 2.38 days.
source: <patch-1.1-2319eb2ddbd-20221220T133941Z-avarab@gmail.com>
source: <cover-0.2-00000000000-20221227T183708Z-avarab@gmail.com>
CI updates. We probably want a clean-up to move the long shell
script embedded in yaml file into a separate file, but that can
come later.
source: <pull.1444.v2.git.1671496548.gitgitgadget@gmail.com>
* ab/no-more-git-global-super-prefix (2022-12-26) 9 commits
(merged to 'next' on 2022-12-28 at 126b1fbad1)
+ read-tree: add "--super-prefix" option, eliminate global
+ submodule--helper: convert "{update,clone}" to their own "--super-prefix"
+ submodule--helper: convert "status" to its own "--super-prefix"
+ submodule--helper: convert "sync" to its own "--super-prefix"
+ submodule--helper: convert "foreach" to its own "--super-prefix"
+ submodule--helper: don't use global --super-prefix in "absorbgitdirs"
+ submodule.c & submodule--helper: pass along "super_prefix" param
+ read-tree + fetch tests: test failing "--super-prefix" interaction
+ submodule absorbgitdirs tests: add missing "Migrating git..." tests
* js/ci-disable-cmake-by-default (2022-12-20) 1 commit
(merged to 'next' on 2023-01-02 at 3f014ca5d1)
+ ci: only run win+VS build & tests in Git for Windows' fork
Stop using "git --super-prefix" and narrow the scope of its use to
the submodule--helper.
source: <cover-v5-0.9-00000000000-20221220T104519Z-avarab@gmail.com>
Stop running win+VS build by default.
source: <pull.1445.git.1671461414191.gitgitgadget@gmail.com>
* ar/typofix-gitattributes-doc (2022-12-28) 1 commit
(merged to 'next' on 2022-12-28 at e193a15659)
+ gitattributes.txt: fix typo in "comma separated"
* js/drop-mingw-test-cmp (2022-12-13) 1 commit
(merged to 'next' on 2023-01-02 at 402866b048)
+ tests(mingw): avoid very slow `mingw_test_cmp`
Typofix.
source: <20221227210156.1532168-1-rybak.a.v@gmail.com>
Use `git diff --no-index` as a test_cmp on Windows.
* dh/mingw-ownership-check-typofix (2022-12-20) 1 commit
(merged to 'next' on 2022-12-28 at 3753a46f6d)
+ mingw: fix typo in an error message from ownership check
Error message typofix.
source: <pull.1393.git.git.1671416810927.gitgitgadget@gmail.com>
* jt/avoid-lazy-fetch-commits (2022-12-15) 4 commits
(merged to 'next' on 2022-12-28 at 35276d17e2)
+ commit: don't lazy-fetch commits
+ object-file: emit corruption errors when detected
+ object-file: refactor map_loose_object_1()
+ object-file: remove OBJECT_INFO_IGNORE_LOOSE
Even in a repository with promisor remote, it is useless to
attempt to lazily attempt fetching an object that is expected to be
commit, because no "filter" mode omits commit objects. Take
advantage of this assumption to fail fast on errors.
source: <cover.1671045259.git.jonathantanmy@google.com>
* km/doc-branch-start-point (2022-12-27) 1 commit
(merged to 'next' on 2022-12-28 at 0c24f1cd9b)
+ doc/git-branch: fix --force description typo
Typofix.
source: <20221226165441.126625-1-kyle@kyleam.com>
* sa/cat-file-mailmap--batch-check (2022-12-20) 2 commits
(merged to 'next' on 2022-12-28 at 57531d3fe8)
+ cat-file: add mailmap support to --batch-check option
+ cat-file: add mailmap support to -s option
'cat-file' gains mailmap support for its '--batch-check' and '-s'
options.
cf. <221220.865ye6xlmo.gmgdl@evledraar.gmail.com>
source: <20221220060113.51010-1-siddharthasthana31@gmail.com>
* sg/test-oid-wo-incomplete-line (2022-12-19) 1 commit
(merged to 'next' on 2022-12-28 at 8dadf8c521)
+ tests: make 'test_oid' print trailing newline
Test helper updates.
source: <20221218162905.3508164-1-szeder.dev@gmail.com>
We'd probably need to revisit "do we really want to, and have to,
lose CRLF vs LF?" later, at which time we may be able to further
clean this up by replacing "git diff --no-index" with "diff -u".
source: <6a80fab7e3936ec56e1583d6136d47487327e907.1670339267.git.gitgitgadget@gmail.com>
--------------------------------------------------
[New Topics]
* pw/ci-print-failure-name-fix (2023-01-04) 1 commit
- ci(github): restore "print test failures" step name
* ar/dup-words-fixes (2023-01-08) 1 commit
(merged to 'next' on 2023-01-09 at 2a5d4537a2)
+ *: fix typos which duplicate a word
(cosmetic) CI regression fix.
Typofixes.
Will merge to 'next'.
source: <pull.1453.git.1672741640587.gitgitgadget@gmail.com>
Will merge to 'master'.
source: <20230107135655.149892-1-rybak.a.v@gmail.com>
* rs/use-enhanced-bre-on-macos (2023-01-04) 1 commit
- grep: use REG_ENHANCED on macOS
* ds/bundle-uri-5 (2023-01-07) 8 commits
- 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
(this branch uses ds/bundle-uri-4.)
Newer regex library macOS stopped enabling GNU-like enhanced BRE,
where '\(A\|B\)' works as alternation, unless explicitly asked with
the REG_ENHANCED flag. "git grep" now can be compiled to do so, to
retain the old behaviour.
Will merge to 'next'.
source: <343a891e-d737-0ace-26a9-3839d3bd5583@web.de>
* cw/submodule-status-in-parallel (2023-01-05) 6 commits
- submodule: call parallel code from serial status
- diff-lib: parallelize run_diff_files for submodules
- diff-lib: refactor match_stat_with_submodule
- submodule: move status parsing into function
- submodule: strbuf variable rename
- run-command: add duplicate_output_fn to run_processes_parallel_opts
"git submodule status" learned to run the comparison in submodule
repositories in parallel.
The bundle-URI subsystem adds support for creation-token heuristics
to help incremental fetches.
Needs review.
source: <https://lore.kernel.org/git/20221108184200.2813458-1-calvinwan@google.com/>
source: <pull.1454.git.1673037405.gitgitgadget@gmail.com>
* kn/attr-from-tree (2023-01-04) 3 commits
- SQUASH???
- attr: add flag `--source` to work with tree-ish
- t0003: move setup for `--all` into new block
Expecting a reroll.
cf. <CAOLa=ZStKKgyaHGjGVpQ5jsSpkdqXuH2RhvWOgrU2qKxGbQFGA@mail.gmail.com>
source: <cover.1671793109.git.karthik.188@gmail.com>
* ws/single-file-cone (2023-01-05) 1 commit
- dir: check for single file cone patterns
The logic to see if we are using the "cone" mode by checking the
sparsity patterns has been tightened to avoid mistaking a pattern
that names a single file as specifying a cone.
Will merge to 'next'.
source: <pull.1446.v2.git.1672734059938.gitgitgadget@gmail.com>
* ds/bundle-uri-4 (2023-01-06) 1 commit
- test-bundle-uri: drop unused variables
* jk/read-object-cleanup (2023-01-08) 5 commits
(merged to 'next' on 2023-01-09 at 19cc3de33e)
+ packfile: inline custom read_object()
+ repo_read_object_file(): stop wrapping read_object_file_extended()
+ read_object_file_extended(): drop lookup_replace option
+ streaming: inline call to read_object_file_extended()
+ object-file: inline calls to read_object()
Code clean-up.
Will merge to 'next'.
source: <Y7fgV5eFx78BHdQ4@coredump.intra.peff.net>
Will merge to 'master'.
source: <Y7l4LsEQcDT9HZ21@coredump.intra.peff.net>
* jk/ext-diff-with-relative (2023-01-06) 3 commits
- diff: drop "name" parameter from prepare_temp_file()
- diff: clean up external-diff argv setup
- diff: use filespec path to set up tempfiles for ext-diff
* jk/strncmp-to-api-funcs (2023-01-08) 2 commits
(merged to 'next' on 2023-01-09 at 47395b7c6f)
+ convert trivial uses of strncmp() to skip_prefix()
+ convert trivial uses of strncmp() to starts_with()
"git diff --relative" did not mix well with "git diff --ext-diff",
which has been corrected.
Code clean-up.
Will merge to 'next'.
source: <Y7f/YiVu1TgbucDI@coredump.intra.peff.net>
Will merge to 'master'.
source: <Y7lyga5g2leSmWQd@coredump.intra.peff.net>
* pb/doc-orig-head (2023-01-08) 5 commits
- git-rebase.txt: add a note about 'ORIG_HEAD' being overwritten
- revisions.txt: be explicit about commands writing 'ORIG_HEAD'
- git-merge.txt: mention 'ORIG_HEAD' in the Description
- git-reset.txt: mention 'ORIG_HEAD' in the Description
- git-cherry-pick.txt: do not use 'ORIG_HEAD' in example
Document ORIG_HEAD a bit more.
Will merge to 'next'?
source: <pull.1456.git.1673120359.gitgitgadget@gmail.com>
* tc/cat-file-z-use-cquote (2023-01-08) 1 commit
. cat-file: quote-format name in error when using -z
"cat-file" in the batch mode that is fed NUL-terminated pathnames
learned to cquote them in its error output (otherwise, a funny
pathname with LF in it would break the lines in the output stream).
Breaks t1006.
cf. https://github.com/git/git/actions/runs/3865911497/jobs/6589699288#step:6:1802
source: <20230105062447.2943709-2-toon@iotcl.com>
* cb/grep-pcre-ucp (2023-01-09) 1 commit
- grep: correctly identify utf-8 characters with \{b,w} in -P
"grep -P" learned to use Unicode Character Property to grok
character classes when processing \b and \w etc.
Will merge to 'next'?
source: <20230108155217.2817-1-carenas@gmail.com>
* es/hooks-and-local-env (2023-01-09) 1 commit
- githooks: discuss Git operations in foreign repositories
Doc update for environment variables set when hooks are invoked.
Will merge to 'next'?
source: <pull.1457.git.1673171924727.gitgitgadget@gmail.com>
* ph/parse-date-reduced-precision (2023-01-09) 1 commit
. date.c: allow ISO 8601 reduced precision times
Loosen date parsing heuristics.
Seems to break many tests.
source: <20221216033638.2582956-1-phil.hord@gmail.com>
--------------------------------------------------
[Stalled]
@ -351,23 +329,109 @@ Release tarballs are available at:
--------------------------------------------------
[Cooking]
* pw/ci-print-failure-name-fix (2023-01-04) 1 commit
(merged to 'next' on 2023-01-08 at 8bb55c12c7)
+ ci(github): restore "print test failures" step name
(cosmetic) CI regression fix.
Will merge to 'master'.
source: <pull.1453.git.1672741640587.gitgitgadget@gmail.com>
* rs/use-enhanced-bre-on-macos (2023-01-08) 1 commit
- use enhanced basic regular expressions on macOS
Newer regex library macOS stopped enabling GNU-like enhanced BRE,
where '\(A\|B\)' works as alternation, unless explicitly asked with
the REG_ENHANCED flag. "git grep" now can be compiled to do so, to
retain the old behaviour.
Under discussion.
cf. <26a0d4ca-3d97-ace4-1a1f-92b1ee6715a6@web.de>
source: <26a0d4ca-3d97-ace4-1a1f-92b1ee6715a6@web.de>
* cw/submodule-status-in-parallel (2023-01-05) 6 commits
- submodule: call parallel code from serial status
- diff-lib: parallelize run_diff_files for submodules
- diff-lib: refactor match_stat_with_submodule
- submodule: move status parsing into function
- submodule: strbuf variable rename
- run-command: add duplicate_output_fn to run_processes_parallel_opts
"git submodule status" learned to run the comparison in submodule
repositories in parallel.
Needs review.
source: <https://lore.kernel.org/git/20221108184200.2813458-1-calvinwan@google.com/>
* kn/attr-from-tree (2023-01-04) 3 commits
- SQUASH???
- attr: add flag `--source` to work with tree-ish
- t0003: move setup for `--all` into new block
Expecting a reroll.
cf. <CAOLa=ZStKKgyaHGjGVpQ5jsSpkdqXuH2RhvWOgrU2qKxGbQFGA@mail.gmail.com>
source: <cover.1671793109.git.karthik.188@gmail.com>
* ws/single-file-cone (2023-01-05) 1 commit
(merged to 'next' on 2023-01-09 at b6d4d7b905)
+ dir: check for single file cone patterns
The logic to see if we are using the "cone" mode by checking the
sparsity patterns has been tightened to avoid mistaking a pattern
that names a single file as specifying a cone.
Will merge to 'master'.
source: <pull.1446.v2.git.1672734059938.gitgitgadget@gmail.com>
* ds/bundle-uri-4 (2023-01-06) 1 commit
(merged to 'next' on 2023-01-08 at d5b03bdd48)
+ test-bundle-uri: drop unused variables
(this branch is used by ds/bundle-uri-5.)
Code clean-up.
Will merge to 'master'.
source: <Y7fgV5eFx78BHdQ4@coredump.intra.peff.net>
* jk/ext-diff-with-relative (2023-01-06) 3 commits
(merged to 'next' on 2023-01-08 at 5233a7d3ee)
+ diff: drop "name" parameter from prepare_temp_file()
+ diff: clean up external-diff argv setup
+ diff: use filespec path to set up tempfiles for ext-diff
"git diff --relative" did not mix well with "git diff --ext-diff",
which has been corrected.
Will merge to 'master'.
source: <Y7f/YiVu1TgbucDI@coredump.intra.peff.net>
* tb/ci-concurrency (2022-11-08) 1 commit
- ci: avoid unnecessary builds
(merged to 'next' on 2023-01-08 at ab7cdc20b8)
+ ci: avoid unnecessary builds
Avoid unnecessary builds in CI, with settings configured in
ci-config.
Will merge to 'next'.
Will merge to 'master'.
source: <ff172f1de982f6f79b598e4ac6d5b2964ca4a098.1667931937.git.me@ttaylorr.com>
* tr/am--no-verify (2023-01-05) 1 commit
- am: allow passing --no-verify flag
(merged to 'next' on 2023-01-08 at 4585013067)
+ am: allow passing --no-verify flag
Conditionally skip the pre-applypatch and applypatch-msg hooks when
applying patches with 'git am'.
Will merge to 'next'.
Will merge to 'master'.
source: <20221130172833.2662751-1-thierry.reding@gmail.com>
@ -408,16 +472,18 @@ Release tarballs are available at:
source: <ffd675e9-8a64-ae05-fc3b-36ae99092735@gmail.com>
* rs/dup-array (2023-01-02) 4 commits
* rs/dup-array (2023-01-09) 5 commits
- use DUP_ARRAY
- add DUP_ARRAY
- do full type check in BARF_UNLESS_COPYABLE
- factor out BARF_UNLESS_COPYABLE
- mingw: make argv2 in try_shell_exec() non-const
Code cleaning.
Will merge to 'next'.
source: <9bc1bd74-f72c-1b43-df7c-950815babb03@web.de>
source: <3e04e283-cad0-7be4-d85c-65d0a52289e2@web.de>
* ab/avoid-losing-exit-codes-in-tests (2022-12-20) 6 commits
@ -436,30 +502,6 @@ Release tarballs are available at:
source: <cover-v4-0.6-00000000000-20221219T101240Z-avarab@gmail.com>
* cw/ci-whitespace (2022-12-20) 3 commits
(merged to 'next' on 2023-01-05 at d3dc35f08c)
+ ci (check-whitespace): move to actions/checkout@v3
+ ci (check-whitespace): add links to job output
+ ci (check-whitespace): suggest fixes for errors
CI updates. We probably want a clean-up to move the long shell
script embedded in yaml file into a separate file, but that can
come later.
Will merge to 'master'.
source: <pull.1444.v2.git.1671496548.gitgitgadget@gmail.com>
* js/ci-disable-cmake-by-default (2022-12-20) 1 commit
(merged to 'next' on 2023-01-02 at 3f014ca5d1)
+ ci: only run win+VS build & tests in Git for Windows' fork
Stop running win+VS build by default.
Will merge to 'master'.
source: <pull.1445.git.1671461414191.gitgitgadget@gmail.com>
* sk/win32-close-handle-upon-pthread-join (2023-01-04) 2 commits
- win32: close handles of threads that have been joined
- win32: prepare pthread.c for change by formatting
@ -471,28 +513,29 @@ Release tarballs are available at:
<source: <pull.1406.v13.git.git.1672762819.gitgitgadget@gmail.com>
* ds/omit-trailing-hash-in-index (2022-12-17) 4 commits
- features: feature.manyFiles implies fast index writes
- test-lib-functions: add helper for trailing hash
- read-cache: add index.skipHash config option
- hashfile: allow skipping the hash function
* ds/omit-trailing-hash-in-index (2023-01-07) 4 commits
(merged to 'next' on 2023-01-09 at e17ef56485)
+ features: feature.manyFiles implies fast index writes
+ test-lib-functions: add helper for trailing hash
+ read-cache: add index.skipHash config option
+ hashfile: allow skipping the hash function
Introduce an optional configuration to allow the trailing hash that
protects the index file from bit flipping.
Will merge to 'next'?
cf. <221216.86sfhf1gbc.gmgdl@evledraar.gmail.com>
source: <pull.1439.v4.git.1671204678.gitgitgadget@gmail.com>
Will merge to 'master'.
source: <pull.1439.v5.git.1673022717.gitgitgadget@gmail.com>
* es/t1509-root-fixes (2022-12-09) 3 commits
- t1509: facilitate repeated script invocations
- t1509: make "setup" test more robust
- t1509: fix failing "root work tree" test due to owner-check
(merged to 'next' on 2023-01-08 at c922e34bab)
+ t1509: facilitate repeated script invocations
+ t1509: make "setup" test more robust
+ t1509: fix failing "root work tree" test due to owner-check
Test fixes.
Will merge to 'next'.
Will merge to 'master'.
source: <pull.1425.git.1668999621.gitgitgadget@gmail.com>
@ -516,33 +559,19 @@ Release tarballs are available at:
source: <87edtp5uws.fsf@kyleam.com>
* js/drop-mingw-test-cmp (2022-12-13) 1 commit
(merged to 'next' on 2023-01-02 at 402866b048)
+ tests(mingw): avoid very slow `mingw_test_cmp`
Use `git diff --no-index` as a test_cmp on Windows.
We'd probably need to revisit "do we really want to, and have to,
lose CRLF vs LF?" later, at which time we may be able to further
clean this up by replacing "git diff --no-index" with "diff -u".
Will merge to 'master'.
source: <6a80fab7e3936ec56e1583d6136d47487327e907.1670339267.git.gitgitgadget@gmail.com>
* ja/worktree-orphan (2022-12-20) 4 commits
. worktree add: add hint to use --orphan when bad ref
. worktree add: add --orphan flag
. worktree add: refactor opt exclusion tests
. worktree add: include -B in usage docs
* ja/worktree-orphan (2023-01-08) 5 commits
- SQUASH???
- worktree add: add hint to direct users towards --orphan
- worktree add: add --orphan flag
- worktree add: refactor opt exclusion tests
- worktree add: include -B in usage docs
'git worktree add' learned how to create a worktree based on an
orphaned branch with `--orphan`.
Seems to break the CI.
cf. https://github.com/git/git/actions/runs/3784676950 (bad with topic)
https://github.com/git/git/actions/runs/3787726481 (good without)
source: <20221220023637.29042-1-jacobabel@nullpo.dev>
Breaks t2400 by using non-portable "grep -P".
cf. https://github.com/git/git/actions/runs/3865911497/jobs/6589699288#step:6:1838
source: <20230107045757.30037-1-jacobabel@nullpo.dev>
* cc/filtered-repack (2022-12-25) 3 commits