diff --git a/src/segments/git.go b/src/segments/git.go index 51770e87..30d8fc30 100644 --- a/src/segments/git.go +++ b/src/segments/git.go @@ -451,6 +451,14 @@ func (g *Git) setBranchStatus() { } func (g *Git) cleanUpstreamURL(url string) string { + // https://{organization}@dev.azure.com/{organization}/{project}/_git/{repository} + if strings.Contains(url, "@dev.azure.com") { + match := regex.FindNamedRegexMatch(`.*@(?Pdev.azure.com.*)`, url) + if len(match) != 0 { + return fmt.Sprintf("https://%s", match["URL"]) + } + } + if strings.HasPrefix(url, "http") { return url } diff --git a/src/segments/git_test.go b/src/segments/git_test.go index dfdf66e6..3f56adad 100644 --- a/src/segments/git_test.go +++ b/src/segments/git_test.go @@ -649,11 +649,12 @@ func TestGitCleanSSHURL(t *testing.T) { {Case: "gitea no port, no user", Expected: "https://src.example.com/user/repo", Upstream: "_gitea@src.example.com:user/repo.git"}, {Case: "git@ with user", Expected: "https://github.com/JanDeDobbeleer/oh-my-posh", Upstream: "git@github.com:JanDeDobbeleer/oh-my-posh"}, {Case: "unsupported", Upstream: "\\test\\repo.git"}, + {Case: "Azure DevOps", Expected: "https://dev.azure.com/posh/oh-my-posh/_git/website", Upstream: "https://posh@dev.azure.com/posh/oh-my-posh/_git/website"}, } for _, tc := range cases { g := &Git{} - upstreamIcon := g.cleanUpstreamURL(tc.Upstream) - assert.Equal(t, tc.Expected, upstreamIcon, tc.Case) + upstreamURL := g.cleanUpstreamURL(tc.Upstream) + assert.Equal(t, tc.Expected, upstreamURL, tc.Case) } }