Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-09-26 09:35:13 +02:00
Code Issues Activity

Merge remote-tracking branch 'upstream/main' into ssh-mirror-migrations

Browse Source 
# Conflicts:
#	go.mod
#	models/repo/mirror.go
#	modules/git/gitcmd/command.go
#	modules/git/remote.go
#	routers/web/user/setting/keys.go
#	services/repository/migrate.go
This commit is contained in:
pomidorry
2026-06-03 19:29:39 +03:00
parent 0c16fac60a fbaaac9c14
commit 80c5948595
2528 changed files with 21394 additions and 14069 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/git/gitcmd/command.go
+6 -6
View File
@@ -16,12 +16,12 @@ import (
"strings"
"time"
"code.gitea.io/gitea/modules/git/internal" //nolint:depguard // only this file can use the internal type CmdArg, other files and packages should use AddXxx functions
"code.gitea.io/gitea/modules/gtprof"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
"gitea.dev/modules/git/internal" //nolint:depguard // only this file can use the internal type CmdArg, other files and packages should use AddXxx functions
"gitea.dev/modules/gtprof"
"gitea.dev/modules/log"
"gitea.dev/modules/process"
"gitea.dev/modules/setting"
"gitea.dev/modules/util"
)
// TrustedCmdArgs returns the trusted arguments for git command.
modules/git/gitcmd/command_test.go
+3 -3
View File
@@ -11,9 +11,9 @@ import (
"testing"
"time"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/tempdir"
"code.gitea.io/gitea/modules/testlogger"
"gitea.dev/modules/setting"
"gitea.dev/modules/tempdir"
"gitea.dev/modules/testlogger"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
modules/git/gitcmd/env.go
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"fmt"
"os/exec"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"gitea.dev/modules/log"
"gitea.dev/modules/setting"
)
var GitExecutable = "git" // the command name of git, will be updated to an absolute path during initialization
modules/git/gitcmd/host_key_test.go
+2 -2
View File
@@ -8,8 +8,8 @@ import (
"path/filepath"
"testing"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
"gitea.dev/modules/setting"
"gitea.dev/modules/util"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"