From 3177e538042a2fb8b120aae73d7e8133cd6cfc12 Mon Sep 17 00:00:00 2001
From: Andre Hartmann <aha_1980@gmx.de>
Date: Sun, 7 Oct 2018 15:29:28 +0200
Subject: [PATCH] Git: Add support for github remotes

Github and gitlab uses a different syntax when cloning with ssh:

 git@github.com:qt-creator/qt-creator.git

Support this pattern for remote validatation also.

Change-Id: Ic67f2238b9cdd526e76715c86846542cdb73f503
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/git/gitclient.cpp | 2 +-
 src/plugins/git/gitplugin.cpp | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 3862cb2479f..6809d89ddf3 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -3378,7 +3378,7 @@ GitRemote::GitRemote(const QString &url)
 {
     static const QRegularExpression remotePattern(
                 "^(?:(?<protocol>[^:]+)://)?(?:(?<user>[^@]+)@)?(?<host>[^:/]+)"
-                "(?::(?<port>\\d+))?:?(?<path>/.*)$");
+                "(?::(?<port>\\d+))?:?(?<path>.*)$");
 
     if (url.isEmpty())
         return;
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 51703db2d6f..8a3fef260b2 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -1612,6 +1612,11 @@ void GitPlugin::testGitRemote_data()
                .host("codereview.qt-project.org")
                .port(29418)
                .path("/qt-creator/qt-creator.git");
+    QTest::newRow("ssh-github")
+            << RemoteTest("git@github.com:qt-creator/qt-creator.git")
+               .userName("git")
+               .host("github.com")
+               .path("qt-creator/qt-creator.git");
     QTest::newRow("local-file-protocol")
             << RemoteTest("file:///tmp/myrepo.git")
                .protocol("file")