forked from qt-creator/qt-creator
Gerrit: Fix host/port resolving
Broke by b0ac6435b3.
Change-Id: I66f9c598b5e7466b93857cb19c40d1d6c796793a
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
committed by
Orgad Shaneh
parent
d08cbf6641
commit
f71971323e
@@ -126,9 +126,11 @@ bool GerritServer::fillFromRemote(const QString &remote, const GerritParameters
|
||||
else
|
||||
return false;
|
||||
|
||||
user.userName = r.userName.isEmpty() ? parameters.server.user.userName : r.userName;
|
||||
if (r.host.contains("github.com")) // Clearly not gerrit
|
||||
return false;
|
||||
host = r.host;
|
||||
port = r.port;
|
||||
user.userName = r.userName.isEmpty() ? parameters.server.user.userName : r.userName;
|
||||
if (type != GerritServer::Ssh) {
|
||||
curlBinary = parameters.curl;
|
||||
if (curlBinary.isEmpty() || !QFile::exists(curlBinary))
|
||||
|
||||
Reference in New Issue
Block a user