undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a function to determine whether a remote is valid

Browse Source 
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>
This commit is contained in:
Daniel Barkalow 2009-11-18 02:42:23 +01:00 committed by Junio C Hamano
parent fb0cc87ec0
commit 0a4da29dd8
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
remote.c
View File

@ -52,6 +52,11 @@ static struct rewrites rewrites_push;
#define BUF_SIZE (2048) #define BUF_SIZE (2048)
static char buffer[BUF_SIZE]; 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) static const char *alias_url(const char *url, struct rewrites *r)
{ {
int i, j; int i, j;
@ -688,14 +693,14 @@ struct remote *remote_get(const char *name)
ret = make_remote(name, 0); ret = make_remote(name, 0);
if (valid_remote_nick(name)) { 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; return NULL;
ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec); ret->fetch = parse_fetch_refspec(ret->fetch_refspec_nr, ret->fetch_refspec);
ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec); ret->push = parse_push_refspec(ret->push_refspec_nr, ret->push_refspec);