aboutsummaryrefslogtreecommitdiff
path: root/builtin-push.c
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-09-19 00:49:27 -0400
committerJunio C Hamano <gitster@pobox.com>2007-09-19 03:22:31 -0700
commit28b91f8ad9e4791b5c35ca6bffbb78725b4e5bbf (patch)
tree4c33b200fefb30c28f9db4f11c19efb02ce81cde /builtin-push.c
parentbbaf4584286657582a92d5bb4038a5a06654ebb1 (diff)
downloadgit-28b91f8ad9e4791b5c35ca6bffbb78725b4e5bbf.tar.gz
git-28b91f8ad9e4791b5c35ca6bffbb78725b4e5bbf.tar.xz
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>
Diffstat (limited to 'builtin-push.c')
-rw-r--r--builtin-push.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin-push.c b/builtin-push.c
index 7d7e826a3..4ee36c292 100644
--- a/builtin-push.c
+++ b/builtin-push.c
@@ -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;