Use a function to determine whether a remote is valid

Currently, it only checks url, but it will allow other things in the future.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/remote.c b/remote.c
index 73d33f2584b061085fcaa0958c26b1c3d4665904..15c9cec60ba352a729171381182d4c98eff0bf30 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -52,6 +52,11 @@ static struct rewrites rewrites_push;
 #define BUF_SIZE (2048)
 static char buffer[BUF_SIZE];
 
 #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, struct rewrites *r)
 {
        int i, j;
 static const char *alias_url(const char *url, struct rewrites *r)
 {
        int i, j;


@@ -688,14 +693,14 @@ struct remote *remote_get(const char *name)
 
        ret = make_remote(name, 0);
        if (valid_remote_nick(name)) {
 
        ret = make_remote(name, 0);
        if (valid_remote_nick(name)) {

-               if (!ret->url)
+               if (!valid_remote(ret))

                        read_remotes_file(ret);
                        read_remotes_file(ret);

-               if (!ret->url)
+               if (!valid_remote(ret))

                        read_branches_file(ret);
        }
                        read_branches_file(ret);
        }

-       if (name_given && !ret->url)
+       if (name_given && !valid_remote(ret))

                add_url_alias(ret, name);
                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);
                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);