git, branch v2.42.0-rc0

Git 2.42-rc0

2023-08-04T17:52:31Z

Signed-off-by: Junio C Hamano

Merge branch 'jc/branch-in-use-error-message'

2023-08-04T17:52:31Z

"git branch -f X" to repoint the branch X said that X was "checked out" in another worktree, even when branch X was not and instead being bisected or rebased. The message was reworded to say the branch was "in use". * jc/branch-in-use-error-message: branch: update the message to refuse touching a branch in-use

Merge branch 'hy/blame-in-bare-with-contents'

2023-08-04T17:52:31Z

"git blame --contents=file" has been taught to work in a bare repository. * hy/blame-in-bare-with-contents: blame: allow --contents to work with bare repo

Merge branch 'jc/parse-options-short-help'

2023-08-04T17:52:31Z

Command line parser fix, and a small parse-options API update. * jc/parse-options-short-help: short help: allow a gap smaller than USAGE_GAP remote: simplify "remote add --tags" help text short help: allow multi-line opthelp

Merge branch 'jc/doc-sent-patch-now-what'

2023-08-04T17:52:31Z

Process document update. * jc/doc-sent-patch-now-what: MyFirstContribution: refrain from self-iterating too much

Merge branch 'la/doc-choose-starting-point-fixup'

2023-08-04T17:52:30Z

Clarify how to pick a starting point for a new topic in the SubmittingPatches document. * la/doc-choose-starting-point-fixup: SubmittingPatches: use of older maintenance tracks is an exception SubmittingPatches: explain why 'next' and above are inappropriate base SubmittingPatches: choice of base for fixing an older maintenance track

Merge branch 'pv/doc-submodule-update-settings'

2023-08-04T17:52:30Z

Rewrite the description of giving a custom command to the submodule..update configuration variable. * pv/doc-submodule-update-settings: doc: highlight that .gitmodules does not support !command

Merge branch 'ja/worktree-orphan-fix'

2023-08-04T17:52:30Z

Fix tests with unportable regex patterns. * ja/worktree-orphan-fix: t2400: rewrite regex to avoid unintentional PCRE builtin/worktree.c: convert tab in advice to space t2400: drop no-op `--sq` from rev-parse call

Merge branch 'jc/retire-get-sha1-hex'

2023-08-04T17:52:30Z

The implementation of "get_sha1_hex()" that reads a hexadecimal string that spells a full object name has been extended to cope with any hash function used in the repository, but the "sha1" in its name survived. Rename it to get_hash_hex(), a name that is more consistent within its friends like get_hash_hex_algop(). * jc/retire-get-sha1-hex: hex: retire get_sha1_hex()

Merge branch 'la/doc-choose-starting-point'

2023-08-04T17:52:30Z

Clarify how to choose the starting point for a new topic in developer guidance document. * la/doc-choose-starting-point: SubmittingPatches: simplify guidance for choosing a starting point SubmittingPatches: emphasize need to communicate non-default starting points SubmittingPatches: de-emphasize branches as starting points SubmittingPatches: discuss subsystems separately from git.git SubmittingPatches: reword awkward phrasing