diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2014-12-23 14:25:05 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-12-23 12:42:36 -0800 |
commit | fb86e32dcc9ed07ee2f1df6aafbf34d469007b1f (patch) | |
tree | 7f881178376fdd55de4245c1c1ada520cda310fb /userdiff.c | |
parent | Sync with maint (diff) | |
download | tgif-fb86e32dcc9ed07ee2f1df6aafbf34d469007b1f.tar.xz |
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>
Diffstat (limited to 'userdiff.c')
0 files changed, 0 insertions, 0 deletions