From f71971323e17e6aba686ef039e81e026b836ae78 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 12 Mar 2017 23:47:56 +0200 Subject: [PATCH] Gerrit: Fix host/port resolving MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Broke by b0ac6435b3786854e7a8d10cf4d8df49ca74618a. Change-Id: I66f9c598b5e7466b93857cb19c40d1d6c796793a Reviewed-by: André Hartmann --- src/plugins/git/gerrit/gerritserver.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/git/gerrit/gerritserver.cpp b/src/plugins/git/gerrit/gerritserver.cpp index 3c8d028fdf9..990279951dc 100644 --- a/src/plugins/git/gerrit/gerritserver.cpp +++ b/src/plugins/git/gerrit/gerritserver.cpp @@ -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))