feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Gerrit: Fix host/port resolving

Browse Source 
Broke by b0ac6435b3.

Change-Id: I66f9c598b5e7466b93857cb19c40d1d6c796793a
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2017-03-12 23:47:56 +02:00
committed by Orgad Shaneh
parent d08cbf6641
commit f71971323e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/git/gerrit/gerritserver.cpp
View File

@@ -126,9 +126,11 @@ bool GerritServer::fillFromRemote(const QString &remote, const GerritParameters
else else
return false; return false;
user.userName = r.userName.isEmpty() ? parameters.server.user.userName : r.userName;
if (r.host.contains("github.com")) // Clearly not gerrit if (r.host.contains("github.com")) // Clearly not gerrit
return false; return false;
host = r.host;
port = r.port;
user.userName = r.userName.isEmpty() ? parameters.server.user.userName : r.userName;
if (type != GerritServer::Ssh) { if (type != GerritServer::Ssh) {
curlBinary = parameters.curl; curlBinary = parameters.curl;
if (curlBinary.isEmpty() || !QFile::exists(curlBinary)) if (curlBinary.isEmpty() || !QFile::exists(curlBinary))