go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-12-20 00:12:29 +02:00
Code Issues Releases Activity

Fix to support creating merge requests for Gitlab/Github repositories cloned with an SSH config alias

Browse Source
This commit is contained in:
Mikhail Akimov
2025-12-05 16:29:58 +02:00
committed by Stefan Haller
parent 0fc8cb35a8
commit d6ff7f152d
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/commands/hosting_service/definitions.go
View File

@@ -4,7 +4,7 @@ package hosting_service
// at https://regex101.com using the flavor Golang // at https://regex101.com using the flavor Golang
var defaultUrlRegexStrings = []string{ var defaultUrlRegexStrings = []string{
`^(?:https?|ssh)://[^/]+/(?P<owner>.*)/(?P<repo>.*?)(?:\.git)?$`, `^(?:https?|ssh)://[^/]+/(?P<owner>.*)/(?P<repo>.*?)(?:\.git)?$`,
`^.*?@.*:/*(?P<owner>.*)/(?P<repo>.*?)(?:\.git)?$`, `^(.*?@)?.*:/*(?P<owner>.*)/(?P<repo>.*?)(?:\.git)?$`,
} }
var defaultRepoURLTemplate = "https://{{.webDomain}}/{{.owner}}/{{.repo}}" var defaultRepoURLTemplate = "https://{{.webDomain}}/{{.owner}}/{{.repo}}"

20
pkg/commands/hosting_service/hosting_service_test.go
View File

@@ -56,6 +56,16 @@ func TestGetPullRequestURL(t *testing.T) {
assert.Equal(t, "https://github.com/peter/calculator/compare/feature%2Fsum-operation?expand=1", url) assert.Equal(t, "https://github.com/peter/calculator/compare/feature%2Fsum-operation?expand=1", url)
}, },
}, },
{
testName: "Opens a link to new pull request on github custom SSH config alias and a corresponding service config",
from: "feature/sum-operation",
remoteUrl: "github:peter/calculator.git",
configServiceDomains: map[string]string{"github": "github:github.com"},
test: func(url string, err error) {
assert.NoError(t, err)
assert.Equal(t, "https://github.com/peter/calculator/compare/feature%2Fsum-operation?expand=1", url)
},
},
{ {
testName: "Opens a link to new pull request on github with extra slash removed", testName: "Opens a link to new pull request on github with extra slash removed",
from: "feature/sum-operation", from: "feature/sum-operation",
@@ -133,6 +143,16 @@ func TestGetPullRequestURL(t *testing.T) {
assert.Equal(t, "https://gitlab.com/peter/calculator/-/merge_requests/new?merge_request%5Bsource_branch%5D=feature%2Fui", url) assert.Equal(t, "https://gitlab.com/peter/calculator/-/merge_requests/new?merge_request%5Bsource_branch%5D=feature%2Fui", url)
}, },
}, },
{
testName: "Opens a link to new pull request on gitlab with custom SSH config alias and a corresponding service config",
from: "feature/ui",
remoteUrl: "gitlab:peter/calculator.git",
configServiceDomains: map[string]string{"gitlab": "gitlab:gitlab.com"},
test: func(url string, err error) {
assert.NoError(t, err)
assert.Equal(t, "https://gitlab.com/peter/calculator/-/merge_requests/new?merge_request%5Bsource_branch%5D=feature%2Fui", url)
},
},
{ {
testName: "Opens a link to new pull request on gitlab with extra slash removed", testName: "Opens a link to new pull request on gitlab with extra slash removed",
from: "feature/ui", from: "feature/ui",