aboutsummaryrefslogtreecommitdiffstats
path: root/modules/git
diff options
context:
space:
mode:
Diffstat (limited to 'modules/git')
-rw-r--r--modules/git/git.go3
-rw-r--r--modules/git/git_test.go3
2 files changed, 4 insertions, 2 deletions
diff --git a/modules/git/git.go b/modules/git/git.go
index 286e1ad8b4..d5caaa0912 100644
--- a/modules/git/git.go
+++ b/modules/git/git.go
@@ -106,7 +106,8 @@ func SetExecutablePath(path string) error {
}
// Init initializes git module
-func Init() error {
+func Init(ctx context.Context) error {
+ DefaultContext = ctx
// Git requires setting user.name and user.email in order to commit changes.
for configKey, defaultValue := range map[string]string{"user.name": "Gitea", "user.email": "gitea@fake.local"} {
if stdout, stderr, err := process.GetManager().Exec("git.Init(get setting)", GitExecutable, "config", "--get", configKey); err != nil || strings.TrimSpace(stdout) == "" {
diff --git a/modules/git/git_test.go b/modules/git/git_test.go
index 0c6259a9c5..27951d639b 100644
--- a/modules/git/git_test.go
+++ b/modules/git/git_test.go
@@ -5,6 +5,7 @@
package git
import (
+ "context"
"fmt"
"os"
"testing"
@@ -16,7 +17,7 @@ func fatalTestError(fmtStr string, args ...interface{}) {
}
func TestMain(m *testing.M) {
- if err := Init(); err != nil {
+ if err := Init(context.Background()); err != nil {
fatalTestError("Init failed: %v", err)
}