summaryrefslogtreecommitdiff
path: root/blob.h
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2014-12-23 14:25:05 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-12-23 12:42:36 -0800
commitfb86e32dcc9ed07ee2f1df6aafbf34d469007b1f (patch)
tree7f881178376fdd55de4245c1c1ada520cda310fb /blob.h
parentSync with maint (diff)
downloadtgif-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 'blob.h')
0 files changed, 0 insertions, 0 deletions