git remote: allow adding remotes agreeing with url.<...>.insteadOf

When adding a remote, we make sure that the remote does not exist already. However, this test was not quite correct: when the url.<...>.insteadOf config variable was set to the remote name to be added, the code would assume that the remote exists already. Let's allow adding remotes when there is a url.<...>.insteadOf setting when both the name and the URL agree with the remote to be added. It might seem like a mistake to compare against remote->url[0] without verifying that remote->url_nr >=1, but at this point a missing URL has been filled by the name already, therefore url_nr cannot be zero. Noticed by Anastas Dancha. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Johannes Schindelin committed Dec 23, 2014 at 14:25 UTC fb86e32dcc9ed07ee2f1df6aafbf34d469007b1f
1 file changed +3 -1
builtin/remote.c
+3 -1
@@ -180,7 +180,9 @@ static int add(int argc, const char **argv)
180 url = argv[1];
181
182 remote = remote_get(name);
183 - if (remote && (remote->url_nr > 1 || strcmp(name, remote->url[0]) ||
183 + if (remote && (remote->url_nr > 1 ||
184 + (strcmp(name, remote->url[0]) &&
185 + strcmp(url, remote->url[0])) ||
186 remote->fetch_refspec_nr))
187 die(_("remote %s already exists."), name);
188