From: Daniel Barkalow Date: Fri, 15 Feb 2008 19:14:18 +0000 (-0500) Subject: Validate nicknames of remote branches to prohibit confusing ones X-Git-Tag: v1.5.4.2~16 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=df93e33c8bc8c79751a45d8005c6a92b18d4ba6d;p=git.git Validate nicknames of remote branches to prohibit confusing ones The original problem was that the parsers for configuration files were getting confused by seeing as nicknames remotes that involved directory-changing characters. In particular, the branches config file for ".." was particularly mystifying on platforms that can open directories and read odd data from them. The validation function was written by Junio Hamano (with a typo corrected). Signed-off-by: Daniel Barkalow Signed-off-by: Junio C Hamano --- diff --git a/remote.c b/remote.c index 20abbc07a..6b56473f5 100644 --- a/remote.c +++ b/remote.c @@ -343,6 +343,16 @@ struct refspec *parse_ref_spec(int nr_refspec, const char **refspec) return rs; } +static int valid_remote_nick(const char *name) +{ + if (!name[0] || /* not empty */ + (name[0] == '.' && /* not "." */ + (!name[1] || /* not ".." */ + (name[1] == '.' && !name[2])))) + return 0; + return !strchr(name, '/'); /* no slash */ +} + struct remote *remote_get(const char *name) { struct remote *ret; @@ -351,7 +361,7 @@ struct remote *remote_get(const char *name) if (!name) name = default_remote_name; ret = make_remote(name, 0); - if (name[0] != '/') { + if (valid_remote_nick(name)) { if (!ret->url) read_remotes_file(ret); if (!ret->url)