summaryrefslogtreecommitdiff
path: root/builtin/fetch.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-07-17 00:42:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-07-17 00:42:48 (GMT)
commitb2fc8226294e52c7f08533b202f2b90ce72b7eaf (patch)
tree49f3d074e3ef48dcdc288a4524d0fda003ec0dc5 /builtin/fetch.c
parent368cab75c1e14c728b3767bad5ec6d46d6f29238 (diff)
parenteff40457a4ab4887c677453d11774322a494a98c (diff)
downloadgit-b2fc8226294e52c7f08533b202f2b90ce72b7eaf.zip
git-b2fc8226294e52c7f08533b202f2b90ce72b7eaf.tar.gz
git-b2fc8226294e52c7f08533b202f2b90ce72b7eaf.tar.bz2
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/fetch.c')
-rw-r--r--builtin/fetch.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 9191620..25740c1 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"));