Update to use UriString.RepositoryUrlsAreEqual

Author: jcansdale

src/GitHub.App/Services/GitClient.cs

@@ -96,19 +96,9 @@ public Task Fetch(IRepository repository, string remoteName)
 
         public Task Fetch(IRepository repo, UriString cloneUrl, params string[] refspecs)
         {
-            var httpsString = cloneUrl.ToRepositoryUrl().ToString();
-
             foreach (var remote in repo.Network.Remotes)
             {
-                var remoteUrl = new UriString(remote.Url);
-                if (!remoteUrl.IsHypertextTransferProtocol)
-                {
-                    // Only match http urls
-                    continue;
-                }
-
-                var remoteHttpsString = remoteUrl.ToRepositoryUrl().ToString();
-                if (remoteHttpsString.Equals(httpsString, StringComparison.OrdinalIgnoreCase))
+                if (UriString.RepositoryUrlsAreEqual(new UriString(remote.Url), cloneUrl))
                 {
                     return Fetch(repo, remote.Name, refspecs);
                 }
@@ -128,7 +118,7 @@ public Task Fetch(IRepository repo, UriString cloneUrl, params string[] refspecs
                         removeRemote = true;
                     }
 
-                    var remote = repo.Network.Remotes.Add(remoteName, httpsString);
+                    var remote = repo.Network.Remotes.Add(remoteName, cloneUrl);
                     try
                     {
 #pragma warning disable 0618 // TODO: Replace `Network.Fetch` with `Commands.Fetch`.

src/GitHub.App/Services/PullRequestService.cs

@@ -568,11 +568,7 @@ async Task<string> CreateRemote(IRepository repo, UriString cloneUri)
         {
             foreach (var remote in repo.Network.Remotes)
             {
-                // Compare Urls ignoring case and any trailing ".git"
-                if (string.Equals(
-                    new UriString(remote.Url).ToRepositoryUrl().ToString(),
-                    cloneUri.ToRepositoryUrl().ToString(),
-                    StringComparison.OrdinalIgnoreCase))
+                if (UriString.RepositoryUrlsAreEqual(new UriString(remote.Url), cloneUri))
                 {
                     return remote.Name;
                 }