From: Johan Herland Date: Fri, 31 Jul 2009 10:00:25 GMT Subject: [RFCv2 05/12] Use a function to determine whether a remote is valid Message-ID: <1249034432-31437-6-git-send-email-johan@herland.net> In-Reply-To: <1249034432-31437-1-git-send-email-johan@herland.net> From: Daniel Barkalow Currently, it only checks url, but it will allow other things in the future. Signed-off-by: Daniel Barkalow Signed-off-by: Johan Herland --- remote.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/remote.c b/remote.c index 758727c..106151f 100644 --- a/remote.c +++ b/remote.c @@ -48,6 +48,11 @@ static int rewrite_nr; #define BUF_SIZE (2048) static char buffer[BUF_SIZE]; +static int valid_remote(const struct remote *remote) +{ + return !!remote->url; +} + static const char *alias_url(const char *url) { int i, j; @@ -669,14 +674,14 @@ struct remote *remote_get(const char *name) ret = make_remote(name, 0); if (valid_remote_nick(name)) { - if (!ret->url) + if (!valid_remote(ret)) read_remotes_file(ret); - if (!ret->url) + if (!valid_remote(ret)) read_branches_file(ret); } - if (name_given && !ret->url) + if (name_given && !valid_remote(ret)) add_url_alias(ret, name); - if (!ret->url) + if (!valid_remote(ret)) return NULL; ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec); ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec); -- 1.6.4.rc3.138.ga6b98.dirty