45 lines
1.2 KiB
Diff
45 lines
1.2 KiB
Diff
--- 9.0.3 2024-12-12 08:06:13.000000000 +0100
|
|
+++ aneksajo 2024-12-16 08:23:15.000000000 +0100
|
|
@@ -40,6 +40,28 @@
|
|
"ssh -o \"UserKnownHostsFile=/dev/null\" -o \"StrictHostKeyChecking=no\" -o \"IdentitiesOnly=yes\" -i \""+keyFile+"\" \"$@\""), 0o700)
|
|
require.NoError(t, err)
|
|
|
|
+ // reset ssh wrapper afterwards
|
|
+ _gitSSH, gitSSHExists := os.LookupEnv("GIT_SSH")
|
|
+ defer func() {
|
|
+ if gitSSHExists {
|
|
+ os.Setenv("GIT_SSH", _gitSSH)
|
|
+ }
|
|
+ }()
|
|
+
|
|
+ _gitSSHCommand, gitSSHCommandExists := os.LookupEnv("GIT_SSH_COMMAND")
|
|
+ defer func() {
|
|
+ if gitSSHCommandExists {
|
|
+ os.Setenv("GIT_SSH_COMMAND", _gitSSHCommand)
|
|
+ }
|
|
+ }()
|
|
+
|
|
+ _gitSSHVariant, gitSSHVariantExists := os.LookupEnv("GIT_SSH_VARIANT")
|
|
+ defer func() {
|
|
+ if gitSSHVariantExists {
|
|
+ os.Setenv("GIT_SSH_VARIANT", _gitSSHVariant)
|
|
+ }
|
|
+ }()
|
|
+
|
|
// Setup ssh wrapper
|
|
t.Setenv("GIT_SSH", path.Join(tmpDir, "ssh"))
|
|
t.Setenv("GIT_SSH_COMMAND",
|
|
@@ -49,6 +71,13 @@
|
|
callback(keyFile)
|
|
}
|
|
|
|
+func createHTTPUrl(gitPath string, u *url.URL) *url.URL {
|
|
+ // this assumes u contains the HTTP base URL that Gitea is running on
|
|
+ u2 := *u
|
|
+ u2.Path = gitPath
|
|
+ return &u2
|
|
+}
|
|
+
|
|
func createSSHUrl(gitPath string, u *url.URL) *url.URL {
|
|
u2 := *u
|
|
u2.Scheme = "ssh"
|