| Message ID | patch-3.3-38930024d95-20210630T163329Z-avarab@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | fetch: fix segfault, missing docs in --negotiate-only | expand |
> diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh > index 66af411057c..920815478c7 100755 > --- a/t/t5702-protocol-v2.sh > +++ b/t/t5702-protocol-v2.sh > @@ -599,6 +599,23 @@ setup_negotiate_only () { > test_commit -C client three > } > > +test_expect_success 'usage: --negotiate-only without --negotiation-tip' ' > + SERVER="server" && > + URI="file://$(pwd)/server" && > + > + setup_negotiate_only "$SERVER" "$URI" && > + > + cat >err.expect <<-\EOF && > + fatal: --negotiate-only needs one or more --negotiate-tip=* > + EOF > + > + test_must_fail git -c protocol.version=2 -C client fetch \ > + --negotiate-only \ > + origin 2>err.actual && > + cat err && I think I inadvertently left a similar line in other tests in this file, but this shouldn't be in. Other than that, all the patches look good to me. Thanks for taking a look at this. I have a patch set [1] that fixes related bugs (but not this one - in particular, --negotiate-only without --negotiation-tip still fails, so we still need this patch set). I've tried merging my set into this set; the merge is clean and all tests still pass, so there shouldn't be any problems with that. [1] https://lore.kernel.org/git/cover.1624486920.git.jonathantanmy@google.com/
diff --git a/builtin/fetch.c b/builtin/fetch.c index 9191620e50c..25740c13df1 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")); diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh index 66af411057c..920815478c7 100755 --- a/t/t5702-protocol-v2.sh +++ b/t/t5702-protocol-v2.sh @@ -599,6 +599,23 @@ setup_negotiate_only () { test_commit -C client three } +test_expect_success 'usage: --negotiate-only without --negotiation-tip' ' + SERVER="server" && + URI="file://$(pwd)/server" && + + setup_negotiate_only "$SERVER" "$URI" && + + cat >err.expect <<-\EOF && + fatal: --negotiate-only needs one or more --negotiate-tip=* + EOF + + test_must_fail git -c protocol.version=2 -C client fetch \ + --negotiate-only \ + origin 2>err.actual && + cat err && + test_cmp err.expect err.actual +' + test_expect_success 'file:// --negotiate-only' ' SERVER="server" && URI="file://$(pwd)/server" &&
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> --- builtin/fetch.c | 3 +++ t/t5702-protocol-v2.sh | 17 +++++++++++++++++ 2 files changed, 20 insertions(+)