From 334bb47ed91e2216d43e222ed6897e3d9871798d Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 5 Jan 2021 17:52:36 -0500 Subject: [PATCH] Trim trailing .git from remote repository names --- .../Components/Repository/GitHubRemoteFeatures.cs | 2 ++ .../Components/Repository/GitLabRemoteFeatures.cs | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/Tgstation.Server.Host/Components/Repository/GitHubRemoteFeatures.cs b/src/Tgstation.Server.Host/Components/Repository/GitHubRemoteFeatures.cs index 260e64fa7e..9a068eb8c9 100644 --- a/src/Tgstation.Server.Host/Components/Repository/GitHubRemoteFeatures.cs +++ b/src/Tgstation.Server.Host/Components/Repository/GitHubRemoteFeatures.cs @@ -51,6 +51,8 @@ namespace Tgstation.Server.Host.Components.Repository RemoteRepositoryOwner = remoteUrl.Segments[1].TrimEnd('/'); RemoteRepositoryName = remoteUrl.Segments[2].TrimEnd('/'); + if (RemoteRepositoryName.EndsWith(".git", StringComparison.OrdinalIgnoreCase)) + RemoteRepositoryName = RemoteRepositoryName[0..^4]; } /// diff --git a/src/Tgstation.Server.Host/Components/Repository/GitLabRemoteFeatures.cs b/src/Tgstation.Server.Host/Components/Repository/GitLabRemoteFeatures.cs index cf5fd71149..c894f9aa84 100644 --- a/src/Tgstation.Server.Host/Components/Repository/GitLabRemoteFeatures.cs +++ b/src/Tgstation.Server.Host/Components/Repository/GitLabRemoteFeatures.cs @@ -45,6 +45,8 @@ namespace Tgstation.Server.Host.Components.Repository { RemoteRepositoryOwner = remoteUrl.Segments[1].TrimEnd('/'); RemoteRepositoryName = remoteUrl.Segments[2].TrimEnd('/'); + if (RemoteRepositoryName.EndsWith(".git", StringComparison.OrdinalIgnoreCase)) + RemoteRepositoryName = RemoteRepositoryName.Substring(0, RemoteRepositoryName.Length - 4); } ///