summaryrefslogtreecommitdiff
path: root/remote.h
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 /remote.h
parentbbaf4584286657582a92d5bb4038a5a06654ebb1 (diff)
downloadgit-28b91f8ad9e4791b5c35ca6bffbb78725b4e5bbf.tar.gz
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 'remote.h')
-rw-r--r--remote.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/remote.h b/remote.h
index b5b558f1f1..05add06e48 100644
--- a/remote.h
+++ b/remote.h
@@ -4,8 +4,8 @@
struct remote {
const char *name;
- const char **uri;
- int uri_nr;
+ const char **url;
+ int url_nr;
const char **push_refspec;
struct refspec *push;
@@ -32,7 +32,7 @@ struct remote *remote_get(const char *name);
typedef int each_remote_fn(struct remote *remote, void *priv);
int for_each_remote(each_remote_fn fn, void *priv);
-int remote_has_uri(struct remote *remote, const char *uri);
+int remote_has_url(struct remote *remote, const char *url);
struct refspec {
unsigned force : 1;