From e6ab919354ec5366f2f6561dacbea23946788c0b Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 23 Nov 2022 13:01:36 +0900 Subject: Autogenerated HTML docs for v2.39.0-rc0 --- RelNotes/2.39.0.txt | 37 +++++++++++++++++++++++++++++ SubmittingPatches.html | 2 +- git-bisect-lk2009.html | 2 +- git-config.html | 14 ++--------- git-log.html | 12 ++++++++++ git-maintenance.html | 16 ++++++------- git-maintenance.txt | 14 +++++------ git-push.html | 21 ++++++---------- git-push.txt | 6 ++++- git-rev-list.html | 12 ++++++++++ git-rev-parse.html | 14 ++++++++++- git-rev-parse.txt | 7 ++++++ git-shortlog.html | 12 ++++++++++ git-tools.html | 2 +- gitcredentials.html | 10 ++++---- gitcredentials.txt | 8 ++++--- howto-index.html | 2 +- howto/coordinate-embargoed-releases.html | 2 +- howto/keep-canonical-history-correct.html | 2 +- howto/maintain-git.html | 15 +++++++++--- howto/maintain-git.txt | 9 +++++-- howto/new-command.html | 2 +- howto/rebase-from-internal-branch.html | 2 +- howto/rebuild-from-update-hook.html | 2 +- howto/recover-corrupted-blob-object.html | 2 +- howto/recover-corrupted-object-harder.html | 2 +- howto/revert-a-faulty-merge.html | 2 +- howto/revert-branch-rebase.html | 2 +- howto/separating-topic-branches.html | 2 +- howto/setup-git-server-over-http.html | 2 +- howto/update-hook-example.html | 2 +- howto/use-git-daemon.html | 2 +- howto/using-merge-subtree.html | 2 +- howto/using-signed-tag-in-pull-request.html | 2 +- rev-list-options.txt | 7 ++++++ technical/api-index.html | 2 +- 36 files changed, 179 insertions(+), 75 deletions(-) diff --git a/RelNotes/2.39.0.txt b/RelNotes/2.39.0.txt index 153bf6d89..bea9260cd 100644 --- a/RelNotes/2.39.0.txt +++ b/RelNotes/2.39.0.txt @@ -35,6 +35,29 @@ UI, Workflows & Features * "git repack" learns to send cruft objects out of the way into packfiles outside the repository. + * 'scalar reconfigure -a' is taught to automatically remove + scalar.repo entires which no longer exist. + + * Redact headers from cURL's h2h3 module in GIT_CURL_VERBOSE and + others. + + * 'git maintenance register' is taught to write configuration to an + arbitrary path, and 'git for-each-repo' is taught to expand tilde + characters in paths. + + * When creating new notes, the template used to get a stray empty + newline, which has been removed. + + * "git receive-pack" used to use all the local refs as the boundary for + checking connectivity of the data "git push" sent, but now it uses + only the refs that it advertised to the pusher. In a repository with + the .hideRefs configuration, this reduces the resources needed to + perform the check. + + * With '--recurse-submodules=on-demand', all submodules are + recursively pushed. + + Performance, Internal Implementation, Development Support etc. -------------------------------------------------------------- @@ -124,6 +147,13 @@ Performance, Internal Implementation, Development Support etc. * A design document for sparse-checkout's future directions has been added. + * Teach chainlint.pl to annotate the original test definition instead + of the token stream. + + * "make coccicheck" is time consuming. It has been made to run more + incrementally. + + Fixes since v2.38 ----------------- @@ -271,6 +301,13 @@ Fixes since v2.38 `update-ref` commands in the sequencer were removed, which has been corrected. + * Fix a regression in the bisect-helper which mistakenly treats + arguments to the command given to 'git bisect run' as arguments to + the helper. + + * Correct an error where `git rebase` would mistakenly use a branch or + tag named "refs/rewritten/xyz" when missing a rebase label. + * Other code cleanup, docfix, build fix, etc. (merge 413bc6d20a ds/cmd-main-reorder later to maint). (merge 8d2863e4ed nw/t1002-cleanup later to maint). diff --git a/SubmittingPatches.html b/SubmittingPatches.html index b5d9ddae4..7d20e7811 100644 --- a/SubmittingPatches.html +++ b/SubmittingPatches.html @@ -1446,7 +1446,7 @@ this problem around.

diff --git a/git-bisect-lk2009.html b/git-bisect-lk2009.html index ddbbfe4f7..546f4b4e8 100644 --- a/git-bisect-lk2009.html +++ b/git-bisect-lk2009.html @@ -1983,7 +1983,7 @@ author to given a talk and for publishing this paper.

diff --git a/git-config.html b/git-config.html index 95dd88f29..3725fb649 100644 --- a/git-config.html +++ b/git-config.html @@ -9337,18 +9337,8 @@ push.recurseSubmodules

- Make sure all submodule commits used by the revisions to be pushed - are available on a remote-tracking branch. If the value is check - then Git will verify that all submodule commits that changed in the - revisions to be pushed are available on at least one remote of the - submodule. If any commits are missing, the push will be aborted and - exit with non-zero status. If the value is on-demand then all - submodules that changed in the revisions to be pushed will be - pushed. If on-demand was not able to push all necessary revisions - it will also be aborted and exit with non-zero status. If the value - is no then default behavior of ignoring submodules when pushing - is retained. You may override this configuration at time of push by - specifying --recurse-submodules=check|on-demand|no. + May be "check", "on-demand", "only", or "no", with the same behavior + as that of "push --recurse-submodules". If not set, no is used by default, unless submodule.recurse is set (in which case a true value means on-demand).

diff --git a/git-log.html b/git-log.html index 57d0b4ef2..3c0e93a3f 100644 --- a/git-log.html +++ b/git-log.html @@ -1334,6 +1334,18 @@ or --all. If a trailing /* is intended, it must be giv explicitly.

+--exclude-hidden=[receive|uploadpack] +
+
+

+ Do not include refs that would be hidden by git-receive-pack or + git-upload-pack by consulting the appropriate receive.hideRefs or + uploadpack.hideRefs configuration along with transfer.hideRefs (see + git-config(1)). This option affects the next pseudo-ref option + --all or --glob and is cleared after processing them. +

+
+
--reflog
diff --git a/git-maintenance.html b/git-maintenance.html index 156864ebd..0be8fd58a 100644 --- a/git-maintenance.html +++ b/git-maintenance.html @@ -812,13 +812,13 @@ register

- Initialize Git config values so any scheduled maintenance will - start running on this repository. This adds the repository to the - maintenance.repo config variable in the current user’s global - config and enables some recommended configuration values for - maintenance.<task>.schedule. The tasks that are enabled are safe - for running in the background without disrupting foreground - processes. + Initialize Git config values so any scheduled maintenance will start + running on this repository. This adds the repository to the + maintenance.repo config variable in the current user’s global config, + or the config specified by --config-file option, and enables some + recommended configuration values for maintenance.<task>.schedule. The + tasks that are enabled are safe for running in the background without + disrupting foreground processes.

The register subcommand will also set the maintenance.strategy config value to incremental, if this value is not previously set. The @@ -1359,7 +1359,7 @@ maintenance.incremental-repack.auto

diff --git a/git-maintenance.txt b/git-maintenance.txt index bb888690e..805e5a2e3 100644 --- a/git-maintenance.txt +++ b/git-maintenance.txt @@ -50,13 +50,13 @@ stop:: the background maintenance is restarted later. register:: - Initialize Git config values so any scheduled maintenance will - start running on this repository. This adds the repository to the - `maintenance.repo` config variable in the current user's global - config and enables some recommended configuration values for - `maintenance..schedule`. The tasks that are enabled are safe - for running in the background without disrupting foreground - processes. + Initialize Git config values so any scheduled maintenance will start + running on this repository. This adds the repository to the + `maintenance.repo` config variable in the current user's global config, + or the config specified by --config-file option, and enables some + recommended configuration values for `maintenance..schedule`. The + tasks that are enabled are safe for running in the background without + disrupting foreground processes. + The `register` subcommand will also set the `maintenance.strategy` config value to `incremental`, if this value is not previously set. The diff --git a/git-push.html b/git-push.html index 8def1a6ac..aa5eac5cb 100644 --- a/git-push.html +++ b/git-push.html @@ -1277,11 +1277,14 @@ a "no-op".

all submodules that changed in the revisions to be pushed will be pushed. If on-demand was not able to push all necessary revisions it will also be aborted and exit with non-zero status. If only is used all - submodules will be recursively pushed while the superproject is left + submodules will be pushed while the superproject is left unpushed. A value of no or using --no-recurse-submodules can be used to override the push.recurseSubmodules configuration variable when no submodule recursion is required.

+

When using on-demand or only, if a submodule has a +"push.recurseSubmodules={on-demand,only}" or "submodule.recurse" configuration, +further recursion will occur. In this case, "only" is treated as "on-demand".

--[no-]verify @@ -2120,18 +2123,8 @@ push.recurseSubmodules

- Make sure all submodule commits used by the revisions to be pushed - are available on a remote-tracking branch. If the value is check - then Git will verify that all submodule commits that changed in the - revisions to be pushed are available on at least one remote of the - submodule. If any commits are missing, the push will be aborted and - exit with non-zero status. If the value is on-demand then all - submodules that changed in the revisions to be pushed will be - pushed. If on-demand was not able to push all necessary revisions - it will also be aborted and exit with non-zero status. If the value - is no then default behavior of ignoring submodules when pushing - is retained. You may override this configuration at time of push by - specifying --recurse-submodules=check|on-demand|no. + May be "check", "on-demand", "only", or "no", with the same behavior + as that of "push --recurse-submodules". If not set, no is used by default, unless submodule.recurse is set (in which case a true value means on-demand).

@@ -2183,7 +2176,7 @@ push.useBitmaps diff --git a/git-push.txt b/git-push.txt index def7657ef..5bb1d5aae 100644 --- a/git-push.txt +++ b/git-push.txt @@ -409,10 +409,14 @@ Specifying `--no-force-if-includes` disables this behavior. all submodules that changed in the revisions to be pushed will be pushed. If on-demand was not able to push all necessary revisions it will also be aborted and exit with non-zero status. If 'only' is used all - submodules will be recursively pushed while the superproject is left + submodules will be pushed while the superproject is left unpushed. A value of 'no' or using `--no-recurse-submodules` can be used to override the push.recurseSubmodules configuration variable when no submodule recursion is required. ++ +When using 'on-demand' or 'only', if a submodule has a +"push.recurseSubmodules={on-demand,only}" or "submodule.recurse" configuration, +further recursion will occur. In this case, "only" is treated as "on-demand". --[no-]verify:: Toggle the pre-push hook (see linkgit:githooks[5]). The diff --git a/git-rev-list.html b/git-rev-list.html index 83a257ffe..9fe84d83f 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -1150,6 +1150,18 @@ or --all. If a trailing /* is intended, it must be giv explicitly.

+--exclude-hidden=[receive|uploadpack] +
+
+

+ Do not include refs that would be hidden by git-receive-pack or + git-upload-pack by consulting the appropriate receive.hideRefs or + uploadpack.hideRefs configuration along with transfer.hideRefs (see + git-config(1)). This option affects the next pseudo-ref option + --all or --glob and is cleared after processing them. +

+
+
--reflog
diff --git a/git-rev-parse.html b/git-rev-parse.html index 2b55c319e..1b0b323f8 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -1064,6 +1064,18 @@ or --all. If a trailing /* is intended, it must be giv explicitly.

+--exclude-hidden=[receive|uploadpack] +
+
+

+ Do not include refs that would be hidden by git-receive-pack or + git-upload-pack by consulting the appropriate receive.hideRefs or + uploadpack.hideRefs configuration along with transfer.hideRefs (see + git-config(1)). This option affects the next pseudo-ref option + --all or --glob and is cleared after processing them. +

+
+
--disambiguate=<prefix>
@@ -2063,7 +2075,7 @@ Similar to above: diff --git a/git-rev-parse.txt b/git-rev-parse.txt index 6b8ca085a..bcd806928 100644 --- a/git-rev-parse.txt +++ b/git-rev-parse.txt @@ -197,6 +197,13 @@ respectively, and they must begin with `refs/` when applied to `--glob` or `--all`. If a trailing '/{asterisk}' is intended, it must be given explicitly. +--exclude-hidden=[receive|uploadpack]:: + Do not include refs that would be hidden by `git-receive-pack` or + `git-upload-pack` by consulting the appropriate `receive.hideRefs` or + `uploadpack.hideRefs` configuration along with `transfer.hideRefs` (see + linkgit:git-config[1]). This option affects the next pseudo-ref option + `--all` or `--glob` and is cleared after processing them. + --disambiguate=:: Show every object whose name begins with the given prefix. The must be at least 4 hexadecimal digits long to diff --git a/git-shortlog.html b/git-shortlog.html index 4d8bfb180..f8cdb3038 100644 --- a/git-shortlog.html +++ b/git-shortlog.html @@ -1273,6 +1273,18 @@ or --all. If a trailing /* is intended, it must be giv explicitly.

+--exclude-hidden=[receive|uploadpack] +
+
+

+ Do not include refs that would be hidden by git-receive-pack or + git-upload-pack by consulting the appropriate receive.hideRefs or + uploadpack.hideRefs configuration along with transfer.hideRefs (see + git-config(1)). This option affects the next pseudo-ref option + --all or --glob and is cleared after processing them. +

+
+
--reflog
diff --git a/git-tools.html b/git-tools.html index bedfaae59..2a55ada25 100644 --- a/git-tools.html +++ b/git-tools.html @@ -752,7 +752,7 @@ more efficiently, so this manually-maintained list has been retired.

diff --git a/gitcredentials.html b/gitcredentials.html index 71737cd8a..5dcd34c50 100644 --- a/gitcredentials.html +++ b/gitcredentials.html @@ -827,7 +827,9 @@ for a password. It is generally configured by adding this to your config:

Credential helpers, on the other hand, are external programs from which Git can request both usernames and passwords; they typically interface with secure -storage provided by the OS or other programs.

+storage provided by the OS or other programs. Alternatively, a +credential-generating helper might generate credentials for certain servers via +some API.

To use a helper, you must first select one to use. Git currently includes the following helpers:

@@ -1090,8 +1092,8 @@ password had been provided.

For a store or erase operation, the helper’s output is ignored.

If a helper fails to perform the requested operation or needs to notify the user of a potential issue, it may write to stderr.

-

If it does not support the requested operation (e.g., a read-only store), -it should silently ignore the request.

+

If it does not support the requested operation (e.g., a read-only store +or generator), it should silently ignore the request.

If a helper receives any other operation, it should silently ignore the request. This leaves room for future operations to be added (older helpers will just ignore the new requests).

@@ -1108,7 +1110,7 @@ helpers will just ignore the new requests).

diff --git a/gitcredentials.txt b/gitcredentials.txt index d6665d2f3..4522471c3 100644 --- a/gitcredentials.txt +++ b/gitcredentials.txt @@ -62,7 +62,9 @@ for a password. It is generally configured by adding this to your config: Credential helpers, on the other hand, are external programs from which Git can request both usernames and passwords; they typically interface with secure -storage provided by the OS or other programs. +storage provided by the OS or other programs. Alternatively, a +credential-generating helper might generate credentials for certain servers via +some API. To use a helper, you must first select one to use. Git currently includes the following helpers: @@ -288,8 +290,8 @@ For a `store` or `erase` operation, the helper's output is ignored. If a helper fails to perform the requested operation or needs to notify the user of a potential issue, it may write to stderr. -If it does not support the requested operation (e.g., a read-only store), -it should silently ignore the request. +If it does not support the requested operation (e.g., a read-only store +or generator), it should silently ignore the request. If a helper receives any other operation, it should silently ignore the request. This leaves room for future operations to be added (older diff --git a/howto-index.html b/howto-index.html index fce1f88c4..1ce8b91b1 100644 --- a/howto-index.html +++ b/howto-index.html @@ -895,7 +895,7 @@ later validate it.

diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html index df45d31e8..227aff4b7 100644 --- a/howto/coordinate-embargoed-releases.html +++ b/howto/coordinate-embargoed-releases.html @@ -1038,7 +1038,7 @@ Thanks, diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index 5d37ed8d5..6e517dd77 100644 --- a/howto/keep-canonical-history-correct.html +++ b/howto/keep-canonical-history-correct.html @@ -938,7 +938,7 @@ tip of your master again and redo the two merges:

diff --git a/howto/maintain-git.html b/howto/maintain-git.html index 283a192c3..8359bc5f5 100644 --- a/howto/maintain-git.html +++ b/howto/maintain-git.html @@ -1103,7 +1103,7 @@ Prepare jch branch, which is used to represent somewhere

-
$ Meta/Reintegrate master..seen >Meta/redo-jch.sh
+
$ Meta/Reintegrate master..jch >Meta/redo-jch.sh
@@ -1189,6 +1189,15 @@ and rectified.
+
Then build the rest of 'jch':
+
+
+
+
$ git checkout jch
+$ sh Meta/redo-jch.sh
+
+
+
When all is well, clean up the redo-jch.sh script with
@@ -1208,7 +1217,7 @@ Rebuild seen.

-
$ Meta/Reintegrate master..seen >Meta/redo-seen.sh
+
$ Meta/Reintegrate jch..seen >Meta/redo-seen.sh
@@ -1469,7 +1478,7 @@ $ git update-ref -d $mf/ai/topic diff --git a/howto/maintain-git.txt b/howto/maintain-git.txt index 215e2edb0..d07c6d44e 100644 --- a/howto/maintain-git.txt +++ b/howto/maintain-git.txt @@ -231,7 +231,7 @@ by doing the following: - Prepare 'jch' branch, which is used to represent somewhere between 'master' and 'seen' and often is slightly ahead of 'next'. - $ Meta/Reintegrate master..seen >Meta/redo-jch.sh + $ Meta/Reintegrate master..jch >Meta/redo-jch.sh The result is a script that lists topics to be merged in order to rebuild 'seen' as the input to Meta/Reintegrate script. Remove @@ -283,6 +283,11 @@ by doing the following: $ git diff jch next + Then build the rest of 'jch': + + $ git checkout jch + $ sh Meta/redo-jch.sh + When all is well, clean up the redo-jch.sh script with $ sh Meta/redo-jch.sh -u @@ -293,7 +298,7 @@ by doing the following: - Rebuild 'seen'. - $ Meta/Reintegrate master..seen >Meta/redo-seen.sh + $ Meta/Reintegrate jch..seen >Meta/redo-seen.sh Edit the result by adding new topics that are not still in 'seen' in the script. Then diff --git a/howto/new-command.html b/howto/new-command.html index 47a0bf388..8ba53752d 100644 --- a/howto/new-command.html +++ b/howto/new-command.html @@ -863,7 +863,7 @@ letter [PATCH 0/n]. diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index ff382b4e9..63157b9f9 100644 --- a/howto/rebase-from-internal-branch.html +++ b/howto/rebase-from-internal-branch.html @@ -895,7 +895,7 @@ the #1' commit.

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index bc3026a1d..4510123a2 100644 --- a/howto/rebuild-from-update-hook.html +++ b/howto/rebuild-from-update-hook.html @@ -847,7 +847,7 @@ This is still crude and does not protect against simultaneous diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index 0ca3d8e3f..42ab5e55a 100644 --- a/howto/recover-corrupted-blob-object.html +++ b/howto/recover-corrupted-blob-object.html @@ -880,7 +880,7 @@ thing.

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index 16ba0b283..9f39c25dc 100644 --- a/howto/recover-corrupted-object-harder.html +++ b/howto/recover-corrupted-object-harder.html @@ -1189,7 +1189,7 @@ int main(int argc, char **argv) diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index f55dc1daa..7217a56b9 100644 --- a/howto/revert-a-faulty-merge.html +++ b/howto/revert-a-faulty-merge.html @@ -1025,7 +1025,7 @@ P---o---o---M---x---x---W---x---M2 diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index 6287c564c..bdcbbe87c 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html @@ -907,7 +907,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index 0c83c9cba..f9f9aa51a 100644 --- a/howto/separating-topic-branches.html +++ b/howto/separating-topic-branches.html @@ -841,7 +841,7 @@ o---o"master" diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index 3e9b0bfbd..fb05394e8 100644 --- a/howto/setup-git-server-over-http.html +++ b/howto/setup-git-server-over-http.html @@ -1071,7 +1071,7 @@ help diagnosing the problem, but removes security checks.

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index 464447fea..294095265 100644 --- a/howto/update-hook-example.html +++ b/howto/update-hook-example.html @@ -930,7 +930,7 @@ that JC can make non-fast-forward pushes on it.

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html index 4676ce398..8b7dda1e2 100644 --- a/howto/use-git-daemon.html +++ b/howto/use-git-daemon.html @@ -791,7 +791,7 @@ a good practice to put the paths after a "--" separator.

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index bcf66b068..982df97d4 100644 --- a/howto/using-merge-subtree.html +++ b/howto/using-merge-subtree.html @@ -848,7 +848,7 @@ Please note that if the other project merges from you, then it will diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html index 948a49380..aaec335c2 100644 --- a/howto/using-signed-tag-in-pull-request.html +++ b/howto/using-signed-tag-in-pull-request.html @@ -952,7 +952,7 @@ as part of the merge commit.

diff --git a/rev-list-options.txt b/rev-list-options.txt index 183750956..ff68e4840 100644 --- a/rev-list-options.txt +++ b/rev-list-options.txt @@ -195,6 +195,13 @@ respectively, and they must begin with `refs/` when applied to `--glob` or `--all`. If a trailing '/{asterisk}' is intended, it must be given explicitly. +--exclude-hidden=[receive|uploadpack]:: + Do not include refs that would be hidden by `git-receive-pack` or + `git-upload-pack` by consulting the appropriate `receive.hideRefs` or + `uploadpack.hideRefs` configuration along with `transfer.hideRefs` (see + linkgit:git-config[1]). This option affects the next pseudo-ref option + `--all` or `--glob` and is cleared after processing them. + --reflog:: Pretend as if all objects mentioned by reflogs are listed on the command line as ``. diff --git a/technical/api-index.html b/technical/api-index.html index ece065f38..c6fd78a58 100644 --- a/technical/api-index.html +++ b/technical/api-index.html @@ -775,7 +775,7 @@ documents them.

-- cgit 1.2.3-korg