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)

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"
 

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 {

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"

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"

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"
 )
 

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"
 )

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"

models/repo_branch.go

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

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"

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"
 )

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"

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"

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"

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"
 )

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"

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"

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"

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 (

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"

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 (

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"

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) {

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 (

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"

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"

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 (

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"

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"

vendor/github.com/gogits/git-module/README.md → vendor/github.com/go-gitea/git/README.md

@@ -1,6 +1,6 @@
-# Git Shell [![Build Status](https://travis-ci.org/gogits/git-module.svg?branch=master)](https://travis-ci.org/gogits/git-module)
+# Git Shell [![Build # Status](https://travis-ci.org/go-gitea/git.svg?branch=master)](https://travis-ci.org/go-gitea/git)
 
-Package git-module is a Go module for Git access through shell commands.
+Package git is a Go module for Git access through shell commands.
 
 ## Limitations
 

vendor/vendor.json

@@ -39,6 +39,12 @@
 			"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",
 			"revision": "9440f336b443056c90d7d448a0a55ad8c7599880",
@@ -147,12 +153,6 @@
 			"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",
 			"revision": "d8aff570fa22d4e38954c753ec8b21862239b31d",