diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-07-17 03:42:48 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-17 03:42:48 +0300 |
| commit | b2fc8226294e52c7f08533b202f2b90ce72b7eaf (patch) | |
| tree | 49f3d074e3ef48dcdc288a4524d0fda003ec0dc5 /Documentation | |
| parent | 368cab75c1e14c728b3767bad5ec6d46d6f29238 (diff) | |
| parent | eff40457a4ab4887c677453d11774322a494a98c (diff) | |
Merge branch 'ab/fetch-negotiate-segv-fix'
Code recently added to support common ancestry negotiation during
"git push" did not sanity check its arguments carefully enough.
* ab/fetch-negotiate-segv-fix:
fetch: fix segfault in --negotiate-only without --negotiation-tip=*
fetch: document the --negotiate-only option
send-pack.c: move "no refs in common" abort earlier
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config/fetch.txt | 3 | ||||
| -rw-r--r-- | Documentation/fetch-options.txt | 13 |
2 files changed, 13 insertions, 3 deletions
diff --git a/Documentation/config/fetch.txt b/Documentation/config/fetch.txt index 6af6f5edb2..63748c02b7 100644 --- a/Documentation/config/fetch.txt +++ b/Documentation/config/fetch.txt @@ -69,7 +69,8 @@ fetch.negotiationAlgorithm:: setting defaults to "skipping". Unknown values will cause 'git fetch' to error out. + -See also the `--negotiation-tip` option for linkgit:git-fetch[1]. +See also the `--negotiate-only` and `--negotiation-tip` options to +linkgit:git-fetch[1]. fetch.showForcedUpdates:: Set to false to enable `--no-show-forced-updates` in diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index 9e7b4e189c..e967ff1874 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -62,8 +62,17 @@ The argument to this option may be a glob on ref names, a ref, or the (possibly abbreviated) SHA-1 of a commit. Specifying a glob is equivalent to specifying this option multiple times, one for each matching ref name. + -See also the `fetch.negotiationAlgorithm` configuration variable -documented in linkgit:git-config[1]. +See also the `fetch.negotiationAlgorithm` and `push.negotiate` +configuration variables documented in linkgit:git-config[1], and the +`--negotiate-only` option below. + +--negotiate-only:: + Do not fetch anything from the server, and instead print the + ancestors of the provided `--negotiation-tip=*` arguments, + which we have in common with the server. ++ +Internally this is used to implement the `push.negotiate` option, see +linkgit:git-config[1]. --dry-run:: Show what would be done, without making any changes. |