Replace gogits/git-module dependency with go-gitea/git (#94)

* Replace gogits/git-module dependency with go-gitea/git Fixes #92 * Remove git alias for git module import (not needed)
go-gitea · Nov 6, 2016 · 6e4252d · 6e4252d
1 parent 55a4d46
commit 6e4252d
Show file tree

Hide file tree

Showing 54 changed files with 37 additions and 37 deletions.
diff --git a/cmd/serve.go b/cmd/serve.go
@@ -14,7 +14,7 @@ import (
 	"time"
 
 	"github.com/Unknwon/com"
-	git "github.com/gogits/git-module"
+	"github.com/go-gitea/git"
 	gouuid "github.com/satori/go.uuid"
 	"github.com/urfave/cli"
 

diff --git a/cmd/web.go b/cmd/web.go
@@ -38,7 +38,7 @@ import (
 	"github.com/go-macaron/session"
 	"github.com/go-macaron/toolbox"
 	"github.com/go-xorm/xorm"
-	git "github.com/gogits/git-module"
+	"github.com/go-gitea/git"
 	gogs "github.com/gogits/go-gogs-client"
 	version "github.com/mcuadros/go-version"
 	"github.com/urfave/cli"
@@ -93,7 +93,7 @@ func checkVersion() {
 		{"github.com/go-macaron/toolbox", toolbox.Version, "0.1.0"},
 		{"gopkg.in/ini.v1", ini.Version, "1.8.4"},
 		{"gopkg.in/macaron.v1", macaron.Version, "1.1.7"},
-		{"github.com/gogits/git-module", git.Version, "0.4.1"},
+		{"github.com/go-gitea/git", git.Version, "0.4.1"},
 		{"github.com/gogits/go-gogs-client", gogs.Version, "0.12.1"},
 	}
 	for _, c := range checkers {

diff --git a/models/action.go b/models/action.go
@@ -16,7 +16,7 @@ import (
 	"github.com/Unknwon/com"
 	"github.com/go-xorm/xorm"
 
-	"github.com/gogits/git-module"
+	"github.com/go-gitea/git"
 	api "github.com/gogits/go-gogs-client"
 
 	"github.com/go-gitea/gitea/modules/base"

diff --git a/models/git_diff.go b/models/git_diff.go
@@ -22,7 +22,7 @@ import (
 	"github.com/go-gitea/gitea/modules/process"
 	"github.com/go-gitea/gitea/modules/setting"
 	"github.com/go-gitea/gitea/modules/template/highlight"
-	git "github.com/gogits/git-module"
+	"github.com/go-gitea/git"
 	"github.com/sergi/go-diff/diffmatchpatch"
 	"golang.org/x/net/html/charset"
 	"golang.org/x/text/transform"

diff --git a/models/pull.go b/models/pull.go
@@ -17,7 +17,7 @@ import (
 	"github.com/go-gitea/gitea/modules/setting"
 	"github.com/go-gitea/gitea/modules/sync"
 	"github.com/go-xorm/xorm"
-	git "github.com/gogits/git-module"
+	"github.com/go-gitea/git"
 	api "github.com/gogits/go-gogs-client"
 )
 

diff --git a/models/release.go b/models/release.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/go-xorm/xorm"
 
-	"github.com/gogits/git-module"
+	"github.com/go-gitea/git"
 
 	"github.com/go-gitea/gitea/modules/process"
 )

diff --git a/models/repo.go b/models/repo.go
@@ -28,7 +28,7 @@ import (
 	"github.com/go-gitea/gitea/modules/setting"
 	"github.com/go-gitea/gitea/modules/sync"
 	"github.com/go-xorm/xorm"
-	git "github.com/gogits/git-module"
+	"github.com/go-gitea/git"
 	api "github.com/gogits/go-gogs-client"
 	version "github.com/mcuadros/go-version"
 	ini "gopkg.in/ini.v1"

diff --git a/models/repo_branch.go b/models/repo_branch.go
@@ -5,7 +5,7 @@
 package models
 
 import (
-	"github.com/gogits/git-module"
+	"github.com/go-gitea/git"
 )
 
 type Branch struct {

diff --git a/models/repo_editor.go b/models/repo_editor.go
@@ -18,7 +18,7 @@ import (
 	"github.com/Unknwon/com"
 	gouuid "github.com/satori/go.uuid"
 
-	git "github.com/gogits/git-module"
+	"github.com/go-gitea/git"
 
 	"github.com/go-gitea/gitea/modules/log"
 	"github.com/go-gitea/gitea/modules/process"

diff --git a/models/update.go b/models/update.go
@@ -10,7 +10,7 @@ import (
 	"os/exec"
 	"strings"
 
-	git "github.com/gogits/git-module"
+	"github.com/go-gitea/git"
 
 	"github.com/go-gitea/gitea/modules/log"
 )

diff --git a/models/user.go b/models/user.go
@@ -24,7 +24,7 @@ import (
 	"github.com/go-xorm/xorm"
 	"github.com/nfnt/resize"
 
-	"github.com/gogits/git-module"
+	"github.com/go-gitea/git"
 	api "github.com/gogits/go-gogs-client"
 
 	"github.com/go-gitea/gitea/modules/avatar"

diff --git a/models/webhook_slack.go b/models/webhook_slack.go
@@ -10,7 +10,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/gogits/git-module"
+	"github.com/go-gitea/git"
 	api "github.com/gogits/go-gogs-client"
 
 	"github.com/go-gitea/gitea/modules/setting"

diff --git a/models/wiki.go b/models/wiki.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/Unknwon/com"
 
-	"github.com/gogits/git-module"
+	"github.com/go-gitea/git"
 
 	"github.com/go-gitea/gitea/modules/setting"
 	"github.com/go-gitea/gitea/modules/sync"

diff --git a/modules/context/repo.go b/modules/context/repo.go
@@ -14,7 +14,7 @@ import (
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/log"
 	"github.com/go-gitea/gitea/modules/setting"
-	git "github.com/gogits/git-module"
+	"github.com/go-gitea/git"
 	editorconfig "gopkg.in/editorconfig/editorconfig-core-go.v1"
 	macaron "gopkg.in/macaron.v1"
 )

diff --git a/routers/api/v1/convert/convert.go b/routers/api/v1/convert/convert.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/Unknwon/com"
 
-	"github.com/gogits/git-module"
+	"github.com/go-gitea/git"
 	api "github.com/gogits/go-gogs-client"
 
 	"github.com/go-gitea/gitea/models"

diff --git a/routers/api/v1/repo/file.go b/routers/api/v1/repo/file.go
@@ -5,7 +5,7 @@
 package repo
 
 import (
-	"github.com/gogits/git-module"
+	"github.com/go-gitea/git"
 
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/context"

diff --git a/routers/install.go b/routers/install.go
@@ -17,7 +17,7 @@ import (
 	"gopkg.in/ini.v1"
 	"gopkg.in/macaron.v1"
 
-	"github.com/gogits/git-module"
+	"github.com/go-gitea/git"
 
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/auth"

diff --git a/routers/repo/commit.go b/routers/repo/commit.go
@@ -13,7 +13,7 @@ import (
 	"github.com/go-gitea/gitea/modules/base"
 	"github.com/go-gitea/gitea/modules/context"
 	"github.com/go-gitea/gitea/modules/setting"
-	git "github.com/gogits/git-module"
+	"github.com/go-gitea/git"
 )
 
 const (

diff --git a/routers/repo/download.go b/routers/repo/download.go
@@ -8,7 +8,7 @@ import (
 	"io"
 	"path"
 
-	"github.com/gogits/git-module"
+	"github.com/go-gitea/git"
 
 	"github.com/go-gitea/gitea/modules/base"
 	"github.com/go-gitea/gitea/modules/context"

diff --git a/routers/repo/editor.go b/routers/repo/editor.go
@@ -18,7 +18,7 @@ import (
 	"github.com/go-gitea/gitea/modules/log"
 	"github.com/go-gitea/gitea/modules/setting"
 	"github.com/go-gitea/gitea/modules/template"
-	git "github.com/gogits/git-module"
+	"github.com/go-gitea/git"
 )
 
 const (

diff --git a/routers/repo/http.go b/routers/repo/http.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 	"time"
 
-	git "github.com/gogits/git-module"
+	"github.com/go-gitea/git"
 
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/base"

diff --git a/routers/repo/middlewares.go b/routers/repo/middlewares.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/context"
-	git "github.com/gogits/git-module"
+	"github.com/go-gitea/git"
 )
 
 func SetEditorconfigIfExists(ctx *context.Context) {

diff --git a/routers/repo/pull.go b/routers/repo/pull.go
@@ -17,7 +17,7 @@ import (
 	"github.com/go-gitea/gitea/modules/context"
 	"github.com/go-gitea/gitea/modules/log"
 	"github.com/go-gitea/gitea/modules/setting"
-	git "github.com/gogits/git-module"
+	"github.com/go-gitea/git"
 )
 
 const (

diff --git a/routers/repo/repo.go b/routers/repo/repo.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/Unknwon/com"
 
-	"github.com/gogits/git-module"
+	"github.com/go-gitea/git"
 
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/auth"

diff --git a/routers/repo/setting.go b/routers/repo/setting.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gogits/git-module"
+	"github.com/go-gitea/git"
 
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/auth"

diff --git a/routers/repo/view.go b/routers/repo/view.go
@@ -21,7 +21,7 @@ import (
 	"github.com/go-gitea/gitea/modules/setting"
 	"github.com/go-gitea/gitea/modules/template"
 	"github.com/go-gitea/gitea/modules/template/highlight"
-	git "github.com/gogits/git-module"
+	"github.com/go-gitea/git"
 )
 
 const (

diff --git a/routers/repo/webhook.go b/routers/repo/webhook.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/Unknwon/com"
 
-	git "github.com/gogits/git-module"
+	"github.com/go-gitea/git"
 	api "github.com/gogits/go-gogs-client"
 
 	"github.com/go-gitea/gitea/models"

diff --git a/routers/repo/wiki.go b/routers/repo/wiki.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gogits/git-module"
+	"github.com/go-gitea/git"
 
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/auth"

diff --git a/vendor/github.com/gogits/git-module/LICENSE → vendor/github.com/go-gitea/git/LICENSE b/vendor/github.com/gogits/git-module/LICENSE → vendor/github.com/go-gitea/git/LICENSE
diff --git a/...or/github.com/gogits/git-module/README.md → vendor/github.com/go-gitea/git/README.md b/...or/github.com/gogits/git-module/README.md → vendor/github.com/go-gitea/git/README.md
diff --git a/vendor/github.com/gogits/git-module/blob.go → vendor/github.com/go-gitea/git/blob.go b/vendor/github.com/gogits/git-module/blob.go → vendor/github.com/go-gitea/git/blob.go
diff --git a/...r/github.com/gogits/git-module/command.go → vendor/github.com/go-gitea/git/command.go b/...r/github.com/gogits/git-module/command.go → vendor/github.com/go-gitea/git/command.go
diff --git a/...or/github.com/gogits/git-module/commit.go → vendor/github.com/go-gitea/git/commit.go b/...or/github.com/gogits/git-module/commit.go → vendor/github.com/go-gitea/git/commit.go
diff --git a/...b.com/gogits/git-module/commit_archive.go → ...github.com/go-gitea/git/commit_archive.go b/...b.com/gogits/git-module/commit_archive.go → ...github.com/go-gitea/git/commit_archive.go
diff --git a/vendor/github.com/gogits/git-module/error.go → vendor/github.com/go-gitea/git/error.go b/vendor/github.com/gogits/git-module/error.go → vendor/github.com/go-gitea/git/error.go
diff --git a/vendor/github.com/gogits/git-module/git.go → vendor/github.com/go-gitea/git/git.go b/vendor/github.com/gogits/git-module/git.go → vendor/github.com/go-gitea/git/git.go
diff --git a/vendor/github.com/gogits/git-module/hook.go → vendor/github.com/go-gitea/git/hook.go b/vendor/github.com/gogits/git-module/hook.go → vendor/github.com/go-gitea/git/hook.go
diff --git a/vendor/github.com/gogits/git-module/repo.go → vendor/github.com/go-gitea/git/repo.go b/vendor/github.com/gogits/git-module/repo.go → vendor/github.com/go-gitea/git/repo.go
diff --git a/...thub.com/gogits/git-module/repo_branch.go → ...or/github.com/go-gitea/git/repo_branch.go b/...thub.com/gogits/git-module/repo_branch.go → ...or/github.com/go-gitea/git/repo_branch.go
diff --git a/...thub.com/gogits/git-module/repo_commit.go → ...or/github.com/go-gitea/git/repo_commit.go b/...thub.com/gogits/git-module/repo_commit.go → ...or/github.com/go-gitea/git/repo_commit.go
diff --git a/...github.com/gogits/git-module/repo_hook.go → vendor/github.com/go-gitea/git/repo_hook.go b/...github.com/gogits/git-module/repo_hook.go → vendor/github.com/go-gitea/git/repo_hook.go
diff --git a/...thub.com/gogits/git-module/repo_object.go → ...or/github.com/go-gitea/git/repo_object.go b/...thub.com/gogits/git-module/repo_object.go → ...or/github.com/go-gitea/git/repo_object.go
diff --git a/...github.com/gogits/git-module/repo_pull.go → vendor/github.com/go-gitea/git/repo_pull.go b/...github.com/gogits/git-module/repo_pull.go → vendor/github.com/go-gitea/git/repo_pull.go
diff --git a/.../github.com/gogits/git-module/repo_tag.go → vendor/github.com/go-gitea/git/repo_tag.go b/.../github.com/gogits/git-module/repo_tag.go → vendor/github.com/go-gitea/git/repo_tag.go
diff --git a/...github.com/gogits/git-module/repo_tree.go → vendor/github.com/go-gitea/git/repo_tree.go b/...github.com/gogits/git-module/repo_tree.go → vendor/github.com/go-gitea/git/repo_tree.go
diff --git a/vendor/github.com/gogits/git-module/sha1.go → vendor/github.com/go-gitea/git/sha1.go b/vendor/github.com/gogits/git-module/sha1.go → vendor/github.com/go-gitea/git/sha1.go
diff --git a/...github.com/gogits/git-module/signature.go → vendor/github.com/go-gitea/git/signature.go b/...github.com/gogits/git-module/signature.go → vendor/github.com/go-gitea/git/signature.go
diff --git a/...github.com/gogits/git-module/submodule.go → vendor/github.com/go-gitea/git/submodule.go b/...github.com/gogits/git-module/submodule.go → vendor/github.com/go-gitea/git/submodule.go
diff --git a/vendor/github.com/gogits/git-module/tag.go → vendor/github.com/go-gitea/git/tag.go b/vendor/github.com/gogits/git-module/tag.go → vendor/github.com/go-gitea/git/tag.go
diff --git a/vendor/github.com/gogits/git-module/tree.go → vendor/github.com/go-gitea/git/tree.go b/vendor/github.com/gogits/git-module/tree.go → vendor/github.com/go-gitea/git/tree.go
diff --git a/...github.com/gogits/git-module/tree_blob.go → vendor/github.com/go-gitea/git/tree_blob.go b/...github.com/gogits/git-module/tree_blob.go → vendor/github.com/go-gitea/git/tree_blob.go
diff --git a/...ithub.com/gogits/git-module/tree_entry.go → vendor/github.com/go-gitea/git/tree_entry.go b/...ithub.com/gogits/git-module/tree_entry.go → vendor/github.com/go-gitea/git/tree_entry.go
diff --git a/vendor/github.com/gogits/git-module/utlis.go → vendor/github.com/go-gitea/git/utlis.go b/vendor/github.com/gogits/git-module/utlis.go → vendor/github.com/go-gitea/git/utlis.go
diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -38,6 +38,12 @@
 			"revision": "fb1f79c6b65acda83063cbc69f6bba1522558bfc",
 			"revisionTime": "2016-01-17T19:21:50Z"
 		},
+		{
+			"checksumSHA1": "K3Gp8Tv/B8otlbsOfQp3UpJGaaE=",
+			"path": "github.com/go-gitea/git",
+			"revision": "766747ef8b271a2b1142edd0a40735f556ec2c1d",
+			"revisionTime": "2016-11-06T09:52:37Z"
+		},
 		{
 			"checksumSHA1": "qM/kf31cT2cxjtHxdzbu8q8jPq0=",
 			"path": "github.com/go-macaron/binding",
@@ -146,12 +152,6 @@
 			"revision": "7f3990acf1833faa5ebd0e86f0a4c72a4b5eba3c",
 			"revisionTime": "2016-08-10T03:50:02Z"
 		},
-		{
-			"checksumSHA1": "PIGpfND20BlypoaFJsy2cH6urxs=",
-			"path": "github.com/gogits/git-module",
-			"revision": "b3009dc4f5842cf9e2e80fef1e125e79c38e4949",
-			"revisionTime": "2016-08-31T20:58:24Z"
-		},
 		{
 			"checksumSHA1": "5P4i69584LOvCooguu2D/pNxU14=",
 			"path": "github.com/gogits/go-gogs-client",