diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-07-08 12:53:15 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-07-08 08:20:16 -0700 |
| commit | eff40457a4ab4887c677453d11774322a494a98c (patch) | |
| tree | 0000930674a61658209b20b9ff34a8a2649dc213 /builtin/fetch.c | |
| parent | fetch: document the --negotiate-only option (diff) | |
| download | tgif-eff40457a4ab4887c677453d11774322a494a98c.tar.xz | |
fetch: fix segfault in --negotiate-only without --negotiation-tip=*
The recent --negotiate-only option would segfault in the call to
oid_array_for_each() in negotiate_using_fetch() unless one or more
--negotiation-tip=* options were provided.
All of the other tests for the feature combine both, but nothing was
checking this assumption, let's do that and add a test for it. Fixes a
bug in 9c1e657a8fd (fetch: teach independent negotiation (no
packfile), 2021-05-04).
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/fetch.c')
| -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 dfde96a435..3f3fa0859f 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")); |