Merge branch 'maint-1.6.1' into maint-1.6.2

[git.git] / remote.c

diff --git a/remote.c b/remote.c
index 199830ea93f6f87cd3764afe1880e968209439c7..c7a8c2b1fbdea9aa03d8a5ccd8cbfb39eed742df 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -105,16 +105,6 @@ static void add_url_alias(struct remote *remote, const char *url)
        add_url(remote, alias_url(url));
 }
 
-static struct remote *get_remote_by_name(const char *name)
-{
-       int i;
-       for (i = 0; i < remotes_nr; i++) {
-               if (!strcmp(name, remotes[i]->name))
-                       return remotes[i];
-       }
-       return NULL;
-}
-
 static struct remote *make_remote(const char *name, int len)
 {
        struct remote *ret;
@@ -665,20 +655,15 @@ struct remote *remote_get(const char *name)
                name = default_remote_name;
                name_given = explicit_default_remote_name;
        }
-       if (name_given)
-               ret = make_remote(name, 0);
-       else {
-               ret = get_remote_by_name(name);
-               if (!ret)
-                       return NULL;
-       }
+
+       ret = make_remote(name, 0);
        if (valid_remote_nick(name)) {
                if (!ret->url)
                        read_remotes_file(ret);
                if (!ret->url)
                        read_branches_file(ret);
        }
-       if (!ret->url)
+       if (name_given && !ret->url)
                add_url_alias(ret, name);
        if (!ret->url)
                return NULL;