Merge branch 'dev' of github.com:gogits/gogs into dev

1 files changed, 30 insertions, 26 deletions

diff --git a/update.go b/update.go
index c9cbb35b..141d6fe8 100644
--- a/update.go
+++ b/update.go
@@ -42,32 +42,7 @@ func newUpdateLogger(execDir string) {
 	qlog.Info("Start logging update...")
 }
 
-// for command: ./gogs update
-func runUpdate(c *cli.Context) {
-	execDir, _ := base.ExecDir()
-	newUpdateLogger(execDir)
-
-	base.NewConfigContext()
-	models.LoadModelsConfig()
-
-	if models.UseSQLite3 {
-		os.Chdir(execDir)
-	}
-
-	models.SetEngine()
-
-	args := c.Args()
-	if len(args) != 3 {
-		qlog.Fatal("received less 3 parameters")
-	}
-
-	refName := args[0]
-	if refName == "" {
-		qlog.Fatal("refName is empty, shouldn't use")
-	}
-	oldCommitId := args[1]
-	newCommitId := args[2]
-
+func update(refName, oldCommitId, newCommitId string) {
 	isNew := strings.HasPrefix(oldCommitId, "0000000")
 	if isNew &&
 		strings.HasPrefix(newCommitId, "0000000") {
@@ -158,3 +133,32 @@ func runUpdate(c *cli.Context) {
 		qlog.Fatalf("runUpdate.models.CommitRepoAction: %v", err)
 	}
 }
+
+// for command: ./gogs update
+func runUpdate(c *cli.Context) {
+	execDir, _ := base.ExecDir()
+	newUpdateLogger(execDir)
+
+	base.NewConfigContext()
+	models.LoadModelsConfig()
+
+	if models.UseSQLite3 {
+		os.Chdir(execDir)
+	}
+
+	models.SetEngine()
+
+	args := c.Args()
+	if len(args) != 3 {
+		qlog.Fatal("received less 3 parameters")
+	}
+
+	refName := args[0]
+	if refName == "" {
+		qlog.Fatal("refName is empty, shouldn't use")
+	}
+	oldCommitId := args[1]
+	newCommitId := args[2]
+
+	update(refName, oldCommitId, newCommitId)
+}