development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-05 18:59:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

remote: drop checks for zero-url case

Browse source 
Now that the previous commit removed the possibility that a "struct
remote" will ever have zero url fields, we can drop a number of
redundant checks and untriggerable code paths.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2024-06-14 06:42:03 -04:00 committed by Junio C Hamano
parent ffce821880
commit aecd794fca
6 changed files with 12 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
builtin/archive.c
View file

@ -31,8 +31,6 @@ static int run_remote_archiver(int argc, const char **argv,
struct packet_reader reader;
_remote = remote_get(remote);
if (!_remote->url.nr)
die(_("git archive: Remote with no URL"));
transport = transport_get(_remote, _remote->url.v[0]);
transport_connect(transport, "git-upload-archive", exec, fd);

2
builtin/ls-remote.c
View file

@ -109,8 +109,6 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
die("bad repository '%s'", dest);
die("No remote configured to list refs from.");
}
if (!remote->url.nr)
die("remote %s has no configured URL", dest);
if (get_url) {
printf("%s\n", remote->url.v[0]);

13
builtin/push.c
View file

@ -438,18 +438,9 @@ static int do_push(int flags,
}
errs = 0;
url = push_url_of_remote(remote);
if (url->nr) {
for (i = 0; i < url->nr; i++) {
struct transport *transport =
transport_get(remote, url->v[i]);
if (flags & TRANSPORT_PUSH_OPTIONS)
transport->push_options = push_options;
if (push_with_options(transport, push_refspec, flags))
errs++;
}
} else {
for (i = 0; i < url->nr; i++) {
struct transport *transport =
transport_get(remote, NULL);
transport_get(remote, url->v[i]);
if (flags & TRANSPORT_PUSH_OPTIONS)
transport->push_options = push_options;
if (push_with_options(transport, push_refspec, flags))

13
builtin/remote.c
View file

@ -1002,8 +1002,7 @@ static int get_remote_ref_states(const char *name,
struct transport *transport;
const struct ref *remote_refs;
transport = transport_get(states->remote, states->remote->url.nr > 0 ?
states->remote->url.v[0] : NULL);
transport = transport_get(states->remote, states->remote->url.v[0]);
remote_refs = transport_get_remote_refs(transport, NULL);
states->queried = 1;
@ -1294,8 +1293,7 @@ static int show(int argc, const char **argv, const char *prefix)
get_remote_ref_states(*argv, &info.states, query_flag);
printf_ln(_("* remote %s"), *argv);
printf_ln(_(" Fetch URL: %s"), info.states.remote->url.nr > 0 ?
info.states.remote->url.v[0] : _("(no URL)"));
printf_ln(_(" Fetch URL: %s"), info.states.remote->url.v[0]);
url = push_url_of_remote(info.states.remote);
for (i = 0; i < url->nr; i++)
/*
@ -1440,10 +1438,7 @@ static int prune_remote(const char *remote, int dry_run)
}
printf_ln(_("Pruning %s"), remote);
printf_ln(_("URL: %s"),
states.remote->url.nr
? states.remote->url.v[0]
: _("(no URL)"));
printf_ln(_("URL: %s"), states.remote->url.v[0]);
for_each_string_list_item(item, &states.stale)
string_list_append(&refs_to_prune, item->util);
@ -1632,8 +1627,6 @@ static int get_url(int argc, const char **argv, const char *prefix)
}
url = push_mode ? push_url_of_remote(remote) : &remote->url;
if (!url->nr)
die(_("no URLs configured for remote '%s'"), remotename);
if (all_mode) {
for (i = 0; i < url->nr; i++)

2
t/helper/test-bundle-uri.c
View file

@ -88,8 +88,6 @@ static int cmd_ls_remote(int argc, const char **argv)
die(_("bad repository '%s'"), dest);
die(_("no remote configured to get bundle URIs from"));
}
if (!remote->url.nr)
die(_("remote '%s' has no configured URL"), dest);
transport = transport_get(remote, NULL);
if (transport_get_remote_bundle_uri(transport) < 0) {

17
transport.c
View file

@ -1112,6 +1112,7 @@ static struct transport_vtable builtin_smart_vtable = {
struct transport *transport_get(struct remote *remote, const char *url)
{
const char *helper;
const char *p;
struct transport *ret = xcalloc(1, sizeof(*ret));
ret->progress = isatty(2);
@ -1127,19 +1128,15 @@ struct transport *transport_get(struct remote *remote, const char *url)
ret->remote = remote;
helper = remote->foreign_vcs;
if (!url && remote->url.nr)
if (!url)
url = remote->url.v[0];
ret->url = url;
/* maybe it is a foreign URL? */
if (url) {
const char *p = url;
while (is_urlschemechar(p == url, *p))
p++;
if (starts_with(p, "::"))
helper = xstrndup(url, p - url);
}
p = url;
while (is_urlschemechar(p == url, *p))
p++;
if (starts_with(p, "::"))
helper = xstrndup(url, p - url);
if (helper) {
transport_helper_init(ret, helper);