What's cooking in git.git (Apr 2023, #03; Tue, 11)

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 and may be annotated with an URL to a message that raises issues but they are no means exhaustive. A topic without enough support may be discarded after a long period of no activity.

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']

* ar/adjust-tests-for-the-index-fallout (2023-03-31) 2 commits (merged to 'next' on 2023-04-06 at 8a9dfa25d4)
+ t2107: fix mention of the_index.cache_changed
+ t3060: fix mention of function prune_index

Comment updates.
source: <[email protected]>

* dw/doc-submittingpatches-grammofix (2023-04-05) 1 commit (merged to 'next' on 2023-04-06 at 1c48670236)
+ SubmittingPatches: clarify MUA discussion with "the"

Grammofix.
source: <ZC0yey+S+OD/S2tt@trent-reznor>

* fc/doc-manpage-base-url-fix (2023-04-05) 1 commit (merged to 'next' on 2023-04-07 at c764614b80)
+ doc: remove manpage-base-url workaround

Modernize manpage generation toolchain.
source: <[email protected]>

* jc/clone-object-format-from-void (2023-04-05) 1 commit (merged to 'next' on 2023-04-07 at 78eb68f3fa)
+ clone: propagate object-format when cloning from void

"git clone" from an empty repository learned to propagate the choice of the hash algorithm from the source repository to the newly created repository.
source: <[email protected]>

* jc/spell-id-in-both-caps-in-message-id (2023-04-03) 1 commit (merged to 'next' on 2023-04-06 at 17f4690220)
+ e-mail workflow: Message-ID is spelled with ID in both capital letters

Consistently spell "Message-ID" as such, not "Message-Id".
source: <[email protected]>

* jk/use-perl-path-consistently (2023-04-06) 1 commit (merged to 'next' on 2023-04-07 at 3aa36fcb80)
+ t/lib-httpd: pass PERL_PATH to CGI scripts

Tests had a few places where we ignored PERL_PATH and blindly used /usr/bin/perl, which have been corrected.
source: <[email protected]>

* jx/cap-object-info-uninitialized-fix (2023-04-03) 1 commit (merged to 'next' on 2023-04-06 at 5a8b6068f3)
+ object-info: init request_info before reading arg

Correct use of an uninitialized structure member.
source: <[email protected]>

* ws/sparse-check-rules (2023-03-27) 2 commits (merged to 'next' on 2023-04-06 at 3fd16233c7)
+ builtin/sparse-checkout: add check-rules command
+ builtin/sparse-checkout: remove NEED_WORK_TREE flag

"git sparse-checkout" command learns a debugging aid for the sparse rule definitions.
source: <[email protected]>

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

* la/mfc-markup-fix (2023-04-06) 1 commit
(merged to 'next' on 2023-04-10 at 05415e1c90)
+ MyFirstContribution: render literal *

Documentation mark-up fix.

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

* ar/t2024-checkout-output-fix (2023-04-10) 1 commit
- t2024: fix loose/strict local base branch DWIM test

Test fix.

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

* fc/doc-stop-using-manversion (2023-04-10) 1 commit
- doc: simplify man version

Doc build simplification.

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

* rn/sparse-diff-index (2023-04-10) 1 commit
- diff-index: enable sparse index

"git diff-index" command has been taught to work better with the sparse index.

Comments?
source: <[email protected]>

* rs/get-tar-commit-id-use-defined-const (2023-04-10) 1 commit
- get-tar-commit-id: use TYPEFLAG_GLOBAL_HEADER instead of magic value

Code clean-up to replace a hardcoded constant with a CPP macro.

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

* rs/remove-approxidate-relative (2023-04-10) 1 commit
- date: remove approxidate_relative()

The approxidate() API has been simplified by losing an extra function that did the same thing as another one.

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

* rs/userdiff-multibyte-regex (2023-04-07) 1 commit
- userdiff: support regexec(3) with multi-byte support

The userdiff regexp patterns for various filetypes that are built into the system have been updated to avoid triggering regexp errors from UTF-8 aware regex engines.

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

* es/recurse-submodules-option-is-a-bool (2023-04-10) 1 commit
- usage: clarify --recurse-submodules as a boolean

The "--[no-]recurse-submodules" option of "git checkout" and others supported an undocumented syntax --recurse-submodules=<value> where the value can spell a Boolean in various ways. The support for the syntax is being dropped.

Comments?
source: <ZDSTFwMFO7vbj/[email protected]>

* gc/better-error-when-local-clone-fails-with-symlink (2023-04-11) 1 commit
- clone: error specifically with --local and symlinked objects

"git clone --local" stops copying from an original repository that has symbolic links inside its $GIT_DIR; an error message when that happens has been updated.

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

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

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

What's the status of this one?
source: <[email protected]>

* 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-separator (2023-03-28) 4 commits
. notes.c: don't do stripespace when parse file arg . notes.c: introduce '--separator=<paragraph-break>' option . notes.c: use designated initializers for clarity . notes.c: cleanup 'strbuf_grow' call in 'append_edit'

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

Seems to break CI.
cf. <[email protected]>
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]>

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

Expecting a reroll.
cf. <CABPp-BGoPuGCZw+9wCgdYyRR4Zf4y9Kun27GrQhtMdYWpOUsYQ@mail.gmail.com>
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]

* rj/sendemail-validate-series-hook (2023-04-05) 1 commit
- hooks: add sendemail-validate-series

"git send-email" learns a new hook that takes the entire set of patch files from its standard input to validate them in one go, instead of getting called once per each file.

Comments?
source: <[email protected]>

* tk/mergetool-gui-default-config (2023-04-05) 1 commit (merged to 'next' on 2023-04-10 at 228432526c)
+ mergetool: new config guiDefault supports auto-toggling gui by DISPLAY

"git mergetool" and "git difftool" learns a new configuration guiDefault to optionally favor configured guitool over non-gui-tool automatically when $DISPLAY is set.

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

* cm/branch-delete-error-message-update (2023-04-06) 1 commit (merged to 'next' on 2023-04-10 at 09c987c822)
+ branch: improve error log on branch not found by checking remotes refs

"git branch -d origin/master" would say "no such branch", but it is likely a missed "-r" if refs/remotes/origin/master exists. The command has been taught to give such a hint in its error message.

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

* fc/remove-header-workarounds-for-asciidoc (2023-04-05) 1 commit (merged to 'next' on 2023-04-10 at f08eab44f2)
+ doc: asciidoc: remove custom header macro

Doc toolchain update to remove old workaround for AsciiDoc.

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

* ow/ref-filter-omit-empty (2023-04-07) 1 commit
- branch, for-each-ref, tag: add option to omit empty lines

"git branch --format=..." and "git format-patch --format=..." learns "--omit-empty" to hide refs that whose formatting result becomes an empty string from the output.

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

* rn/sparse-describe (2023-04-03) 1 commit
- describe: enable sparse index for describe

"git describe --dirty" learns to work better with sparse-index.

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

* ah/format-patch-thread-doc (2023-04-03) 1 commit
- format-patch: correct documentation of --thread without an argument

Doc update.
source: <[email protected]>

* ar/test-cleanup-unused-file-creation-part2 (2023-04-03) 6 commits
- t2019: don't create unused files
- t1502: don't create unused files
- t1450: don't create unused files
- t1300: don't create unused files
- t1300: fix config file syntax error descriptions
- t0300: don't create unused file

Test cleanup.

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

* en/header-split-cache-h (2023-04-11) 24 commits
- mailmap, quote: move declarations of global vars to correct unit
- treewide: reduce includes of cache.h in other headers
- treewide: remove double forward declaration of read_in_full
- cache.h: remove unnecessary includes
- treewide: remove cache.h inclusion due to pager.h changes
- pager.h: move declarations for pager.c functions from cache.h
- treewide: remove cache.h inclusion due to editor.h changes
- editor: move editor-related functions and declarations into common file
- treewide: remove cache.h inclusion due to object.h changes
- object.h: move some inline functions and defines from cache.h
- treewide: remove cache.h inclusion due to object-file.h changes
- object-file.h: move declarations for object-file.c functions from cache.h
- treewide: remove cache.h inclusion due to git-zlib changes
- git-zlib: move declarations for git-zlib functions from cache.h
- treewide: remove cache.h inclusion due to object-name.h changes
- object-name.h: move declarations for object-name.c functions from cache.h
- treewide: remove unnecessary cache.h inclusion
- treewide: be explicit about dependence on mem-pool.h
- treewide: be explicit about dependence on oid-array.h
- treewide: be explicit about dependence on pack-revindex.h
- treewide: be explicit about dependence on convert.h
- treewide: be explicit about dependence on advice.h
- treewide: be explicit about dependence on trace.h & trace2.h
- Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-cache-h

Header clean-up.

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

* sl/sparse-write-tree (2023-04-04) 1 commit
(merged to 'next' on 2023-04-10 at 0cd39c23b1)
+ write-tree: integrate with sparse index

"git write-tree" learns to work better with sparse-index.

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

* ed/fsmonitor-windows-named-pipe (2023-03-24) 1 commit
- fsmonitor: handle differences between Windows named pipe functions

Fix fsmonitor on Windows when the filesystem path contains certain characters.

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

* mh/credential-password-expiry-wincred (2023-04-03) 1 commit
- credential/wincred: store password_expiry_utc

Teach the recently invented "password expiry time" trait to the wincred credential helper.

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

* mh/use-wincred-from-system (2023-03-27) 1 commit
- credential/wincred: include wincred.h

Code clean-up.

Area maintainer is fairly negative. Perhaps drop? cf. <[email protected]>
source: <[email protected]>

* ob/revert-of-revert (2023-03-28) 1 commit
- sequencer: call a revert of a revert "reapply"

Instead of "Revert "Revert "original"", give "Replay "original"" as the title for a revert of a revert.

Needs more polishing: docs, tests, transitions.
source: <[email protected]>

* pw/sequencer-rescheduled-ones-are-not-done-yet (2023-03-20) 1 commit
- rebase -i: do not update "done" when rescheduling command

"rebase -i" moved a "rescheduled" insn in the todo file to the "done" list before it completed, which has been corrected.

Expecting clarification.
source: <[email protected]>

* rs/archive-from-subdirectory-fixes (2023-03-24) 1 commit
- archive: improve support for running in subdirectory

"git archive" run from a subdirectory mishandled attributes and paths outside the current directory.
source: <[email protected]>

* tb/pack-bitmap-index-seek (2023-03-20) 6 commits
- pack-bitmap.c: factor out bitmap_index_seek_commit()
- pack-bitmap.c: use bitmap_index_seek() where possible
- pack-bitmap.c: factor out manual map_pos manipulation
- pack-bitmap.c: drop unnecessary 'inline's
- pack-bitmap.c: hide bitmap internals in read_be32()
- pack-bitmap.c: hide bitmap internals in read_u8()

Clean-up the pack-bitmap codepath.

Kicked back to 'seen' out of 'next'.
There is a BUG() on data errors that needs to be fixed.
source: <[email protected]>

* nw/for-each-ref-signature (2023-03-13) 1 commit
. ref-filter: add new "signature" atom

"git (for-each-ref|branch|tag) --format=<format>" learns the "%(signature)" placeholder and friends.

Breaks CI.
cf. <[email protected]>
source: <[email protected]>

* mh/credential-oauth-refresh-token (2023-03-14) 1 commit
- credential: new attribute oauth_refresh_token

The credential subsystem learns to help OAuth framework.

Needs Review.
source: <[email protected]>

* mh/credential-password-expiry-libsecret (2023-03-27) 1 commit
- credential/libsecret: support password_expiry_utc

The libsecret credential helper learns to handle the password expiry time information.

Needs Review.
source: <[email protected]>

* pw/rebase-cleanup-merge-strategy-option-handling (2023-04-10) 5 commits (merged to 'next' on 2023-04-11 at a3b1fd5ec7)
+ rebase: remove a couple of redundant strategy tests
+ rebase -m: fix serialization of strategy options
+ rebase -m: cleanup --strategy-option handling
+ sequencer: use struct strvec to store merge strategy options
+ rebase: stop reading and writing unnecessary strategy state

Clean-up of the code path that deals with merge strategy option handling in "git rebase".

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

* sl/diff-files-sparse (2023-03-22) 2 commits
- diff-files: integrate with sparse index
- t1092: add tests for git diff-files

Teach "diff-files" not to expand sparse-index unless needed.

Comments?
source: <[email protected]>

* my/wildmatch-cleanups (2023-02-27) 5 commits
. wildmatch: more cleanups after killing uchar
. wildmatch: use char instead of uchar
. wildmatch: remove NEGATE_CLASS(2) macros with trivial refactoring . wildmatch: remove IS*() macros
. git-compat-util: add isblank() and isgraph()

Code clean-up.

Ejected as it conflicts with pw/wildmatch-fixes topic.
source: <[email protected]>

* cw/forbid-use-of-gitlink-outside-submodules (2023-02-28) 6 commits . add: reject nested repositories
. tests: remove duplicate .gitmodules path
. tests: use git submodule add and fix expected status . tests: use git submodule add and fix expected diffs . tests: Use git submodule add instead of git add
. t4041, t4060: modernize test style

Forbid "git add dir" from adding a gitlink to the index.

Comments?
Seems to break tests when merged to 'seen'.
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]>

* rj/branch-unborn-in-other-worktrees (2023-03-27) 5 commits
- branch: avoid unnecessary worktrees traversals
- branch: rename orphan branches in any worktree
- branch: description for orphan branch errors
- branch: use get_worktrees() in copy_or_rename_branch()
- branch: test for failures while renaming branches

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

Kicked out of 'next' to replace with an updated version.
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]>

* cb/checkout-same-branch-twice (2023-03-22) 2 commits
- SQUASH??? the test marked to expect failure passes from day one
- 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]>

* 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-03-03) 2 commits
. cat-file: quote-format name in error when using -z . cat-file: extract printing batch error message into function

"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 "cat-file --batch-all-objects --batch-check". cf. <[email protected]>
source: <[email protected]>

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

Expecting a reroll.
cf. <CAFySSZDk05m6gU5-V1R+y3YnQ5PPduVW54+_gjBwD0rmacsLsw@mail.gmail.com> cf. <[email protected]>
source: <[email protected]>

Sorry for letting this linger for a bit, I've been stymied with other topics that has limited my attention on this series.

AFAICT, it shouldn't be conflicting with any other in-flight topics right now, so keeping it in 'seen' as-is shouldn't be an issue. But if you want to kick it out of there, too, that's equally fine with me.

I do intend on getting back to it shortly, though, hopefully next week.

Thanks,
Taylor

I wanted to wait a bit to hear back from Ævar Arnfjörð Bjarmason and then to resend a v3 with any necessary fixes and with "Acked-by" trailer from Øystein Walle for patch 5/6.

https://lore.kernel.org/git/CAFaJEqug4bghEMnEQzGDN10EqM8e8iSf5i12AvOm+NZzDCQKOw@mail.gmail.com/

Thanks for stopping me. Will look forward to the new iteration. No rush.

I just sent a review of the newest version [1] with some minor nits & questions that may prompt a re-roll (depending on the author's/others' thoughts).

[1] https://lore.kernel.org/git/[email protected]/

This looks good to me, agreed that it's ready for 'next'.

Sorry for getting to this one so late - I did have some comments [2] on the tests in this patch that weren't addressed. However, I'm fairly certain the integration itself is correct, so I may just submit the test updates as a separate patch in the (near-ish?) future.

[2] https://lore.kernel.org/git/[email protected]/

I also just sent a review for this one [3] [4], with similar nits & questions to those in the 'diff-index' integration.

[3] https://lore.kernel.org/git/[email protected]/
[4] https://lore.kernel.org/git/[email protected]/

Thanks.

Yeah, thanks for helping the author to polish the topic into a very good shape.

Again, very much appreciated.

Yup, I saw them. Looked very sensible.

Thanks.