mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2025-02-21 02:55:37 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(git): parse SSH URL's more reliably

Browse source 
resolves #3472
This commit is contained in:
Jan De Dobbeleer 2023-02-09 07:37:58 +01:00 committed by Jan De Dobbeleer
parent b2ab703ea2
commit 19ced2699d
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/segments/git.go
View file

@ -396,8 +396,8 @@ func (g *Git) getUpstreamIcon() string {
} }
url = strings.TrimPrefix(url, "ssh://") url = strings.TrimPrefix(url, "ssh://")
url = strings.TrimPrefix(url, "git://") url = strings.TrimPrefix(url, "git://")
if strings.HasPrefix(url, "git@") { if i := strings.Index(url, "@"); i >= 0 {
url = strings.TrimPrefix(url, "git@") url = url[i+1:]
url = strings.Replace(url, ":", "/", 1) url = strings.Replace(url, ":", "/", 1)
} }
url = strings.TrimSuffix(url, ".git") url = strings.TrimSuffix(url, ".git")

2
src/segments/git_test.go
View file

@ -597,6 +597,7 @@ func TestGitUpstream(t *testing.T) {
}{ }{
{Case: "No upstream", Expected: "", Upstream: ""}, {Case: "No upstream", Expected: "", Upstream: ""},
{Case: "SSH url", Expected: "G", Upstream: "ssh://git@git.my.domain:3001/ADIX7/dotconfig.git"}, {Case: "SSH url", Expected: "G", Upstream: "ssh://git@git.my.domain:3001/ADIX7/dotconfig.git"},
{Case: "Gitea", Expected: "EX", Upstream: "_gitea@src.example.com:user/repo.git"},
{Case: "GitHub", Expected: "GH", Upstream: "github.com/test"}, {Case: "GitHub", Expected: "GH", Upstream: "github.com/test"},
{Case: "Gitlab", Expected: "GL", Upstream: "gitlab.com/test"}, {Case: "Gitlab", Expected: "GL", Upstream: "gitlab.com/test"},
{Case: "Bitbucket", Expected: "BB", Upstream: "bitbucket.org/test"}, {Case: "Bitbucket", Expected: "BB", Upstream: "bitbucket.org/test"},
@ -619,6 +620,7 @@ func TestGitUpstream(t *testing.T) {
GitIcon: "G", GitIcon: "G",
UpstreamIcons: map[string]string{ UpstreamIcons: map[string]string{
"mycustom.server": "CU", "mycustom.server": "CU",
"src.example.com": "EX",
}, },
} }
g := &Git{ g := &Git{