Skip to contentSkip to conversation

What's cooking in git.git (Feb 2023, #05; Fri, 24)

DISCUSSION Junio C Hamano 2 participants 4 messages Feb 24, 2023 – Feb 27, 2023

lore
Share & tools
lore
#0 lore raw

Here are the topics that have been cooking in my tree. Commits prefixed with '+' are in 'next' (being in 'next' is a sign that a topic is stable enough to be used and are candidate to be in a future release). Commits prefixed with '-' are only in 'seen', and aren't considered "accepted" at all. A topic without enough support may be discarded after a long period of no activity.

We are at Git 2.40-rc0 as of today. There are a handful of topics still cooking in 'next', and more topics that we have seen but haven't hit 'next' yet. Many of the former are expected to be in -rc1 while many of the latter are expected to wait for the next cycle.

Copies of the source code to Git live in many repositories, and the following is a list of the ones I push into or their mirrors. Some repositories have only a subset of branches.

With maint, master, next, seen, todo:

	git://git.kernel.org/pub/scm/git/git.git/
	git://repo.or.cz/alt-git.git/
	https://kernel.googlesource.com/pub/scm/git/git/
	https://github.com/git/git/
	https://gitlab.com/git-vcs/git/

With all the integration branches and topics broken out:

https://github.com/gitster/git/

Even though the preformatted documentation in HTML and man format are not sources, they are published in these repositories for convenience (replace "htmldocs" with "manpages" for the manual pages):

git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/

Release tarballs are available at:

https://www.kernel.org/pub/software/scm/git/

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

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

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

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

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

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

* ah/rebase-merges-config (2023-02-23) 3 commits
- rebase: add a config option for --rebase-merges
- rebase: stop accepting --rebase-merges=""
- rebase: add documentation and test for --no-rebase-merges

Streamline --rebase-merges command line option handling and introduce rebase.merges configuration variable.

On Hold.
cf. <[email protected]>
source: <[email protected]>

* en/dir-api-cleanup (2023-02-23) 11 commits
- unpack-trees: add usage notices around df_conflict_entry
- unpack-trees: special case read-tree debugging as internal usage
- unpack-trees: rewrap a few overlong lines from previous patch
- unpack-trees: mark fields only used internally as internal
- unpack_trees: start splitting internal fields from public API
- sparse-checkout: avoid using internal API of unpack-trees, take 2
- sparse-checkout: avoid using internal API of unpack-trees
- unpack-trees: clean up some flow control
- dir: mark output only fields of dir_struct as such
- dir: add a usage note to exclude_per_dir
- dir: separate public from internal portion of dir_struct

source: <[email protected]>

* en/header-cleanup (2023-02-23) 17 commits
- diff.h: remove unnecessary include of object.h
- Remove unnecessary includes of builtin.h
- treewide: replace cache.h with more direct headers, where possible
- replace-object.h: move read_replace_refs declaration from cache.h to here
- object-store.h: move struct object_info from cache.h
- dir.h: refactor to no longer need to include cache.h
- object.h: stop depending on cache.h; make cache.h depend on object.h
- ident.h: move ident-related declarations out of cache.h
- pretty.h: move has_non_ascii() declaration from commit.h
- cache.h: remove dependence on hex.h; make other files include it explicitly
- hex.h: move some hex-related declarations from cache.h
- hash.h: move some oid-related declarations from cache.h
- alloc.h: move ALLOC_GROW() functions from cache.h
- treewide: remove unnecessary cache.h includes in source files
- treewide: remove unnecessary cache.h includes
- treewide: remove unnecessary git-compat-util.h includes in headers
- treewide: ensure one of the appropriate headers is sourced first

source: <[email protected]>

* jk/http-test-fixes (2023-02-23) 16 commits
- t5559: make SSL/TLS the default
- t5559: fix test failures with LIB_HTTPD_SSL
- t/lib-httpd: enable HTTP/2 "h2" protocol, not just h2c
- t/lib-httpd: respect $HTTPD_PROTO in expect_askpass()
- t5551: drop curl trace lines without headers
- t5551: handle v2 protocol in cookie test
- t5551: simplify expected cookie file
- t5551: handle v2 protocol in upload-pack service test
- t5551: handle v2 protocol when checking curl trace
- t5551: stop forcing clone to run with v0 protocol
- t5551: handle HTTP/2 when checking curl trace
- t5551: lower-case headers in expected curl trace
- t5551: drop redundant grep for Accept-Language
- t5541: simplify and move "no empty path components" test
- t5541: stop marking "used receive-pack service" test as v0 only
- t5541: run "used receive-pack service" test earlier

source: <Y/dEYYWKy/[email protected]>

* pw/rebase-i-parse-fix (2023-02-23) 2 commits
- rebase -i: fix parsing of "fixup -C<commit>"
- rebase -i: match whole word in is_command()

source: <[email protected]>

* zy/t9700-style (2023-02-23) 3 commits
- t9700: delete whitespaces after redirect operators
- t9700: change indents to TAB
- t9700: fix title style

source: <[email protected]>

* jk/fsck-indices-in-worktrees (2023-02-24) 3 commits
- fsck: mention file path for index errors
- fsck: check index files in all worktrees
- fsck: factor out index fsck

source: <Y/[email protected]>

* jk/unused-post-2.39-part2 (2023-02-24) 21 commits
- help: mark unused parameter in git_unknown_cmd_config()
- run_processes_parallel: mark unused callback parameters
- userformat_want_item(): mark unused parameter
- for_each_commit_graft(): mark unused callback parameter
- rewrite_parents(): mark unused callback parameter
- fetch-pack: mark unused parameter in callback function
- notes: mark unused callback parameters
- prio-queue: mark unused parameters in comparison functions
- for_each_object: mark unused callback parameters
- list-objects: mark unused callback parameters
- mark unused parameters in signal handlers
- run-command: mark error routine parameters as unused
- mark "pointless" data pointers in callbacks
- ref-filter: mark unused callback parameters
- http-backend: mark unused parameters in virtual functions
- http-backend: mark argc/argv unused
- object-name: mark unused parameters in disambiguate callbacks
- serve: mark unused parameters in virtual functions
- serve: use repository pointer to get config
- ls-refs: drop config caching
- ref-filter: drop unused atom parameter from get_worktree_path()

source: <Y/habYJxDRJQg/[email protected]>

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

* ja/worktree-orphan (2023-01-13) 4 commits
- 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.

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

* tl/notes--blankline (2023-02-23) 3 commits
. notes.c: introduce '--separator=<paragraph-break>' option . notes.c: cleanup for "designated init"
. notes.c: cleanup 'strbuf_grow' call in 'append_edit'

'git notes append' was taught '--separator' to specify string to insert between paragraphs.

Leaky???
source: <[email protected]>

* ab/tag-object-type-errors (2022-11-22) 5 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
- object-file.c: free the "t.tag" in check_tag()
- 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.

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

* ed/fsmonitor-inotify (2022-12-13) 6 commits
- fsmonitor: update doc for Linux
- fsmonitor: test updates
- fsmonitor: enable fsmonitor for Linux
- fsmonitor: implement filesystem change listener for Linux
- fsmonitor: determine if filesystem is local or remote
- fsmonitor: prepare to share code between Mac OS and Linux

Bundled fsmonitor for Linux using inotify API.

Needs review on the updated round.
source: <[email protected]>

* jc/spell-id-in-both-caps-in-message-id (2022-12-17) 1 commit
- e-mail workflow: Message-ID is spelled with ID in both capital letters

Consistently spell "Message-ID" as such, not "Message-Id".

Needs review.
source: <[email protected]>

* 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.

Needs review.
source: <[email protected]>

* 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.

May want to discard. Breaking compatibility does not seem worth it.
source: <[email protected]>

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

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

* jk/shorten-unambiguous-ref-wo-sscanf (2023-02-15) 3 commits (merged to 'next' on 2023-02-24 at 12ca5684f0)
+ 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 'master'.
source: <[email protected]>

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

* 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 (merged to 'next' on 2023-02-24 at 709ed91a7c)
+ 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 'master'.
source: <[email protected]>

* rs/archive-mtime (2023-02-18) 1 commit
(merged to 'next' on 2023-02-24 at 34869696a2)
+ 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 'master'.
source: <[email protected]>

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

* if/simplify-trace-setup (2023-02-21) 1 commit
(merged to 'next' on 2023-02-24 at 9c8e690f3d)
+ trace.c, git.c: remove unnecessary parameter to trace_repo_setup()

Code clean-up.

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

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

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

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

* ew/commit-reach-clean-up-flags-fix (2023-02-11) 1 commit
- commit-reach: avoid NULL dereference

Under discussion.
cf. <[email protected]>
source: <[email protected]>

* mh/credential-password-expiry (2023-02-22) 1 commit (merged to 'next' on 2023-02-24 at dbff7db22a)
+ credential: new attribute password_expiry_utc

The credential subsystem learned that a password may have an explicit expiration.

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

* 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".

On hold. 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: <[email protected]>

* jc/gpg-lazy-init (2023-02-09) 1 commit
- gpg-interface: lazily initialize and read the configuration

Instead of forcing each command to choose to honor GPG related configuration variables, make the subsystem lazily initialize itself.

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

* 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

Allow information carried on the WWW-AUthenticate header to be passed to the credential helpers.

Expecting a reroll.
cf. <Y/c1+Llb/[email protected]>
source: <[email protected]>

* ab/avoid-losing-exit-codes-in-tests (2023-02-06) 6 commits
- tests: don't lose misc "git" exit codes
- tests: don't lose exit status with "test <op> $(git ...)"
- tests: don't lose "git" exit codes in "! ( git ... | grep )"
- tests: don't lose exit status with "(cd ...; test <op> $(git ...))"
- t/lib-patch-mode.sh: fix ignored exit codes
- auto-crlf tests: don't lose exit code in loops and outside tests

Test clean-up.

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

* rj/branch-unborn-in-other-worktrees (2023-02-22) 3 commits
- branch: rename orphan branches in any worktree
- branch: description for orphan branch errors
- branch: avoid unnecessary worktrees traversals

Error messages given when working on an unborn branch that is checked out in another worktree have been improvved.

Comments?
source: <[email protected]>

* 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.

Expecting a reroll.
The 'tunnel' part is still iffy.
cf. <[email protected]>
source: <[email protected]>

* ab/config-multi-and-nonbool (2023-02-07) 10 commits
- for-each-repo: with bad config, don't conflate <path> and <cmd>
- config API: add "string" version of *_value_multi(), fix segfaults
- config API users: test for *_get_value_multi() segfaults
- for-each-repo: error on bad --config
- config API: don't lose the git_*get*() return values
- config API: have *_multi() return an "int" and take a "dest"
- versioncmp.c: refactor config reading next commit
- config API: add and use a "git_config_get()" family of functions
- config tests: add "NULL" tests for *_get_value_multi()
- config tests: cover blind spots in git_die_config() tests

Assorted config API updates.

Drop [06/10] step before merging in?
cf. <[email protected]>
source: <[email protected]>

* cb/checkout-same-branch-twice (2023-01-20) 1 commit
- checkout/switch: disallow checking out same branch in multiple worktrees

"git checkout -B $branch" failed to protect against checking out a branch that is checked out elsewhere, unlike "git branch -f" did.

Expecting a hopefully minor and final reroll. cf. <[email protected]>
source: <[email protected]>

* 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)
- branch: fix die_if_checked_out() when ignore_current_worktree

A few subcommands have been taught to stop users from working on a branch that is being used in another worktree linked to the same repository.

Expecting a hopefully minor and final reroll. cf. <[email protected]>
source: <[email protected]>

* rj/bisect-already-used-branch (2023-01-22) 1 commit
- bisect: fix "reset" when branch is checked out elsewhere

Allow "git bisect reset [name]" to check out the named branch (or the original one) even when the branch is already checked out in a different worktree linked to the same repository.

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

* ms/send-email-feed-header-to-validate-hook (2023-01-19) 2 commits
- send-email: expose header information to git-send-email's sendemail-validate hook
- send-email: refactor header generation functions

"git send-email" learned to give the e-mail headers to the validate hook by passing an extra argument from the command line.

Expecting a hopefully minor and final reroll.
cf. <[email protected]>
source: <[email protected]>

* tc/cat-file-z-use-cquote (2023-01-16) 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).

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

* cw/submodule-status-in-parallel (2023-02-09) 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: 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.

Not quite there yet...
source: <[email protected]>

--------------------------------------------------
[Discarded]

* mc/switch-advice (2022-11-09) 1 commit
. po: use switch over checkout in error message

Use 'switch' instead of 'checkout' in an error message.

Will discard.
Getting tired of waiting for review response.

* js/range-diff-mbox (2022-11-23) 1 commit
. range-diff: support reading mbox files

'git range-diff' gained support for reading either side from an .mbox file instead of a revision range.

Will discard.
Getting tired of waiting for review response.
cf. <[email protected]>
source: <[email protected]>

* jc/test-prereq-symlink-update (2023-02-09) 1 commit . test: make SYMLINKS prerequisite more robust

For some reason, "ln -s x y && test -h y" started passing on Windows, even though we do not have working readlink(3) there. Tighten the check to enable SYMLINKS prerequisite in our tests.

It turns out that this was caused by using a faulty build of the Windows dev environment, which was fixed.
source: <[email protected]>

* jc/t5559-workaround (2023-02-09) 1 commit
. t5559: skip a known-to-be-broken test

source: <[email protected]>

#1 lore raw
Quoted 1 line · Junio C Hamano

[New Topics]

Any feedback for <20230212090426.M558990@dcvr>?
([PATCH v2] fetch: support hideRefs to speed up connectivity checks)

Thanks.

#2 lore raw
Quoted 5 lines · Eric Wong
Quoted 1 line · Junio C Hamano

[New Topics]

Any feedback for <20230212090426.M558990@dcvr>?
([PATCH v2] fetch: support hideRefs to speed up connectivity checks)

Ah, that one slipped through the cracks, it seems.

Thanks for pinging; queued.

#3 lore raw
Quoted 11 lines · Junio C Hamano
Quoted 5 lines · Eric Wong
Quoted 1 line · Junio C Hamano

[New Topics]

Any feedback for <20230212090426.M558990@dcvr>?
([PATCH v2] fetch: support hideRefs to speed up connectivity checks)

Ah, that one slipped through the cracks, it seems.

Thanks for pinging; queued.

Ah, sorry, you were asking for "feedback". I think relative to the original RFC I think what you have is an improvement. It does make me wonder if we want to later add 'push' to the family to complete the client-server for both directions, but that is irrelevant in evaluating this change.

Thanks.