On Thu, Jan 05, 2023 at 02:09:34PM -0500, Derrick Stolee wrote:
> > Not a huge deal, but I noticed that Coverity complained about the
> > uploadpack one because this hit 'next' (the server_options one I found
> > manually, but it was kind of obvious when looking at the other).
>
> Yes, removing these lines would be fine. Perhaps there were
> uses for these in an earlier version that were dropped. But
> we can remove them now and then add them back when they
> actually connect to functionality.
Thanks for confirming. Here's a patch that can go on top of
ds/bundle-uri-4 (or just on master, as that topic has now graduated).
-- >8 --
Subject: [PATCH] test-bundle-uri: drop unused variables
Commit 70b9c10373 (bundle-uri client: add helper for testing server,
2022-12-22) added a cmd_ls_remote() function which contains "uploadpack"
and "server_options" variables. Neither of these variables is ever
modified after being initialized, so the code to handle non-NULL and
non-empty values is impossible to reach.
While in theory we might add command-line parsing to set these, let's
drop the dead code for now in the name of cleanliness. It's easy enough
to add it back later if need be.
Noticed by Coverity.
Signed-off-by: Jeff King <peff@xxxxxxxx>
---
t/helper/test-bundle-uri.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/t/helper/test-bundle-uri.c b/t/helper/test-bundle-uri.c
index 5df5bc3b89..b18e760310 100644
--- a/t/helper/test-bundle-uri.c
+++ b/t/helper/test-bundle-uri.c
@@ -76,8 +76,6 @@ static int cmd__bundle_uri_parse(int argc, const char **argv, enum input_mode mo
static int cmd_ls_remote(int argc, const char **argv)
{
- const char *uploadpack = NULL;
- struct string_list server_options = STRING_LIST_INIT_DUP;
const char *dest;
struct remote *remote;
struct transport *transport;
@@ -95,11 +93,6 @@ static int cmd_ls_remote(int argc, const char **argv)
die(_("remote '%s' has no configured URL"), dest);
transport = transport_get(remote, NULL);
- if (uploadpack)
- transport_set_option(transport, TRANS_OPT_UPLOADPACK, uploadpack);
- if (server_options.nr)
- transport->server_options = &server_options;
-
if (transport_get_remote_bundle_uri(transport) < 0) {
error(_("could not get the bundle-uri list"));
status = 1;
--
2.39.0.463.g3774f23bc9
