2 files changed, 32 insertions, 3 deletions
diff --git a/modules/git/git.go b/modules/git/git.go
index 632af539cc..bda39da918 100644
--- a/modules/git/git.go
+++ b/modules/git/git.go
@@ -91,17 +91,20 @@ func init() {
 	if version.Compare(gitVersion, GitVersionRequired, "<") {
 		panic(fmt.Sprintf("Git version not supported. Requires version > %v", GitVersionRequired))
 	}
+}
 
+// Init initializes git module
+func Init() error {
 	// 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) == "" {
 			// ExitError indicates this config is not set
 			if _, ok := err.(*exec.ExitError); ok || strings.TrimSpace(stdout) == "" {
 				if _, stderr, gerr := process.GetManager().Exec("git.Init(set "+configKey+")", "git", "config", "--global", configKey, defaultValue); gerr != nil {
-					panic(fmt.Sprintf("Failed to set git %s(%s): %s", configKey, gerr, stderr))
+					return fmt.Errorf("Failed to set git %s(%s): %s", configKey, gerr, stderr)
 				}
 			} else {
-				panic(fmt.Sprintf("Failed to get git %s(%s): %s", configKey, err, stderr))
+				return fmt.Errorf("Failed to get git %s(%s): %s", configKey, err, stderr)
 			}
 		}
 	}
@@ -109,8 +112,9 @@ func init() {
 	// Set git some configurations.
 	if _, stderr, err := process.GetManager().Exec("git.Init(git config --global core.quotepath false)",
 		GitExecutable, "config", "--global", "core.quotepath", "false"); err != nil {
-		panic(fmt.Sprintf("Failed to execute 'git config --global core.quotepath false': %s", stderr))
+		return fmt.Errorf("Failed to execute 'git config --global core.quotepath false': %s", stderr)
 	}
+	return nil
 }
 
 // Fsck verifies the connectivity and validity of the objects in the database
diff --git a/modules/git/git_test.go b/modules/git/git_test.go
new file mode 100644
index 0000000000..0c6259a9c5
--- /dev/null
+++ b/modules/git/git_test.go
@@ -0,0 +1,25 @@
+// Copyright 2019 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package git
+
+import (
+	"fmt"
+	"os"
+	"testing"
+)
+
+func fatalTestError(fmtStr string, args ...interface{}) {
+	fmt.Fprintf(os.Stderr, fmtStr, args...)
+	os.Exit(1)
+}
+
+func TestMain(m *testing.M) {
+	if err := Init(); err != nil {
+		fatalTestError("Init failed: %v", err)
+	}
+
+	exitStatus := m.Run()
+	os.Exit(exitStatus)
+}