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 /builtin | |
| 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 'builtin')
| -rw-r--r-- | builtin/fetch.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c index 9191620e50..25740c13df 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -1990,6 +1990,9 @@ int cmd_fetch(int argc, const char **argv, const char *prefix) fetch_config_from_gitmodules(sfjc, rs); } + if (negotiate_only && !negotiation_tip.nr) + die(_("--negotiate-only needs one or more --negotiate-tip=*")); + if (deepen_relative) { if (deepen_relative < 0) die(_("Negative depth in --deepen is not supported")); |