Rename remote.uri to remote.url within remote handling internals

Anyplace we talk about the address of a remote repository we always
refer to it as a URL, especially in the configuration file and
.git/remotes where we call it "remote.$n.url" or start the first
line with "URL:".  Calling this value a uri within the internal C
code just doesn't jive well with our commonly accepted terms.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Shawn O. Pearce
2007-09-19 00:49:27 -04:00
committed by Junio C Hamano
parent bbaf458428
commit 28b91f8ad9
5 changed files with 26 additions and 26 deletions

View File

@ -57,9 +57,9 @@ static int do_push(const char *repo, int flags)
refspec_nr = remote->push_refspec_nr;
}
errs = 0;
for (i = 0; i < remote->uri_nr; i++) {
for (i = 0; i < remote->url_nr; i++) {
struct transport *transport =
transport_get(remote, remote->uri[i]);
transport_get(remote, remote->url[i]);
int err;
if (receivepack)
transport_set_option(transport,
@ -68,14 +68,14 @@ static int do_push(const char *repo, int flags)
transport_set_option(transport, TRANS_OPT_THIN, "yes");
if (verbose)
fprintf(stderr, "Pushing to %s\n", remote->uri[i]);
fprintf(stderr, "Pushing to %s\n", remote->url[i]);
err = transport_push(transport, refspec_nr, refspec, flags);
err |= transport_disconnect(transport);
if (!err)
continue;
error("failed to push to '%s'", remote->uri[i]);
error("failed to push to '%s'", remote->url[i]);
errs++;
}
return !!errs;