From 24b6177e0261efba063c0b83ae0cdc5993945da9 Mon Sep 17 00:00:00 2001 From: Jonas Fonseca Date: Sun, 13 Apr 2008 11:56:54 +0200 Subject: git-remote: reject adding remotes with invalid names This can happen if the arguments to git-remote add is switched by the user, and git would only show an error if fetching was also requested. Fix it by using the refspec parsing engine to check if the requested name can be parsed as a remote before add it. Also cleanup so that the "remote..url" config name buffer is only initialized once. Signed-off-by: Jonas Fonseca Signed-off-by: Junio C Hamano --- builtin-remote.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'builtin-remote.c') diff --git a/builtin-remote.c b/builtin-remote.c index d77f10a0e..8fe31dbd9 100644 --- a/builtin-remote.c +++ b/builtin-remote.c @@ -88,18 +88,22 @@ static int add(int argc, const char **argv) strbuf_init(&buf, 0); strbuf_init(&buf2, 0); + strbuf_addf(&buf2, "refs/heads/test:refs/remotes/%s/test", name); + if (!valid_fetch_refspec(buf2.buf)) + die("'%s' is not a valid remote name", name); + strbuf_addf(&buf, "remote.%s.url", name); if (git_config_set(buf.buf, url)) return 1; + strbuf_reset(&buf); + strbuf_addf(&buf, "remote.%s.fetch", name); + if (track.nr == 0) path_list_append("*", &track); for (i = 0; i < track.nr; i++) { struct path_list_item *item = track.items + i; - strbuf_reset(&buf); - strbuf_addf(&buf, "remote.%s.fetch", name); - strbuf_reset(&buf2); if (mirror) strbuf_addf(&buf2, "refs/%s:refs/%s", -- cgit v1.2.1