summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2021-07-08 10:53:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-07-08 15:20:16 (GMT)
commiteff40457a4ab4887c677453d11774322a494a98c (patch)
tree0000930674a61658209b20b9ff34a8a2649dc213 /builtin
parent60fadf8bd2abe6bede48bcf42377f6c8b7c1d0bb (diff)
downloadgit-eff40457a4ab4887c677453d11774322a494a98c.zip
git-eff40457a4ab4887c677453d11774322a494a98c.tar.gz
git-eff40457a4ab4887c677453d11774322a494a98c.tar.bz2
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')
-rw-r--r--builtin/fetch.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c
index dfde96a..3f3fa08 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"));