Browse Source

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)
Sandro Santilli 3 years ago
parent
commit
6e4252dad4
54 changed files with 37 additions and 37 deletions
  1. 1 1
      cmd/serve.go
  2. 2 2
      cmd/web.go
  3. 1 1
      models/action.go
  4. 1 1
      models/git_diff.go
  5. 1 1
      models/pull.go
  6. 1 1
      models/release.go
  7. 1 1
      models/repo.go
  8. 1 1
      models/repo_branch.go
  9. 1 1
      models/repo_editor.go
  10. 1 1
      models/update.go
  11. 1 1
      models/user.go
  12. 1 1
      models/webhook_slack.go
  13. 1 1
      models/wiki.go
  14. 1 1
      modules/context/repo.go
  15. 1 1
      routers/api/v1/convert/convert.go
  16. 1 1
      routers/api/v1/repo/file.go
  17. 1 1
      routers/install.go
  18. 1 1
      routers/repo/commit.go
  19. 1 1
      routers/repo/download.go
  20. 1 1
      routers/repo/editor.go
  21. 1 1
      routers/repo/http.go
  22. 1 1
      routers/repo/middlewares.go
  23. 1 1
      routers/repo/pull.go
  24. 1 1
      routers/repo/repo.go
  25. 1 1
      routers/repo/setting.go
  26. 1 1
      routers/repo/view.go
  27. 1 1
      routers/repo/webhook.go
  28. 1 1
      routers/repo/wiki.go
  29. 0 0
      vendor/github.com/go-gitea/git/LICENSE
  30. 2 2
      vendor/github.com/gogits/git-module/README.md
  31. 0 0
      vendor/github.com/go-gitea/git/blob.go
  32. 0 0
      vendor/github.com/go-gitea/git/command.go
  33. 0 0
      vendor/github.com/go-gitea/git/commit.go
  34. 0 0
      vendor/github.com/go-gitea/git/commit_archive.go
  35. 0 0
      vendor/github.com/go-gitea/git/error.go
  36. 0 0
      vendor/github.com/go-gitea/git/git.go
  37. 0 0
      vendor/github.com/go-gitea/git/hook.go
  38. 0 0
      vendor/github.com/go-gitea/git/repo.go
  39. 0 0
      vendor/github.com/go-gitea/git/repo_branch.go
  40. 0 0
      vendor/github.com/go-gitea/git/repo_commit.go
  41. 0 0
      vendor/github.com/go-gitea/git/repo_hook.go
  42. 0 0
      vendor/github.com/go-gitea/git/repo_object.go
  43. 0 0
      vendor/github.com/go-gitea/git/repo_pull.go
  44. 0 0
      vendor/github.com/go-gitea/git/repo_tag.go
  45. 0 0
      vendor/github.com/go-gitea/git/repo_tree.go
  46. 0 0
      vendor/github.com/go-gitea/git/sha1.go
  47. 0 0
      vendor/github.com/go-gitea/git/signature.go
  48. 0 0
      vendor/github.com/go-gitea/git/submodule.go
  49. 0 0
      vendor/github.com/go-gitea/git/tag.go
  50. 0 0
      vendor/github.com/go-gitea/git/tree.go
  51. 0 0
      vendor/github.com/go-gitea/git/tree_blob.go
  52. 0 0
      vendor/github.com/go-gitea/git/tree_entry.go
  53. 0 0
      vendor/github.com/go-gitea/git/utlis.go
  54. 6 6
      vendor/vendor.json

+ 1 - 1
cmd/serve.go

@@ -14,7 +14,7 @@ import (
14 14
 	"time"
15 15
 
16 16
 	"github.com/Unknwon/com"
17
-	git "github.com/gogits/git-module"
17
+	"github.com/go-gitea/git"
18 18
 	gouuid "github.com/satori/go.uuid"
19 19
 	"github.com/urfave/cli"
20 20
 

+ 2 - 2
cmd/web.go

@@ -38,7 +38,7 @@ import (
38 38
 	"github.com/go-macaron/session"
39 39
 	"github.com/go-macaron/toolbox"
40 40
 	"github.com/go-xorm/xorm"
41
-	git "github.com/gogits/git-module"
41
+	"github.com/go-gitea/git"
42 42
 	gogs "github.com/gogits/go-gogs-client"
43 43
 	version "github.com/mcuadros/go-version"
44 44
 	"github.com/urfave/cli"
@@ -93,7 +93,7 @@ func checkVersion() {
93 93
 		{"github.com/go-macaron/toolbox", toolbox.Version, "0.1.0"},
94 94
 		{"gopkg.in/ini.v1", ini.Version, "1.8.4"},
95 95
 		{"gopkg.in/macaron.v1", macaron.Version, "1.1.7"},
96
-		{"github.com/gogits/git-module", git.Version, "0.4.1"},
96
+		{"github.com/go-gitea/git", git.Version, "0.4.1"},
97 97
 		{"github.com/gogits/go-gogs-client", gogs.Version, "0.12.1"},
98 98
 	}
99 99
 	for _, c := range checkers {

+ 1 - 1
models/action.go

@@ -16,7 +16,7 @@ import (
16 16
 	"github.com/Unknwon/com"
17 17
 	"github.com/go-xorm/xorm"
18 18
 
19
-	"github.com/gogits/git-module"
19
+	"github.com/go-gitea/git"
20 20
 	api "github.com/gogits/go-gogs-client"
21 21
 
22 22
 	"github.com/go-gitea/gitea/modules/base"

+ 1 - 1
models/git_diff.go

@@ -22,7 +22,7 @@ import (
22 22
 	"github.com/go-gitea/gitea/modules/process"
23 23
 	"github.com/go-gitea/gitea/modules/setting"
24 24
 	"github.com/go-gitea/gitea/modules/template/highlight"
25
-	git "github.com/gogits/git-module"
25
+	"github.com/go-gitea/git"
26 26
 	"github.com/sergi/go-diff/diffmatchpatch"
27 27
 	"golang.org/x/net/html/charset"
28 28
 	"golang.org/x/text/transform"

+ 1 - 1
models/pull.go

@@ -17,7 +17,7 @@ import (
17 17
 	"github.com/go-gitea/gitea/modules/setting"
18 18
 	"github.com/go-gitea/gitea/modules/sync"
19 19
 	"github.com/go-xorm/xorm"
20
-	git "github.com/gogits/git-module"
20
+	"github.com/go-gitea/git"
21 21
 	api "github.com/gogits/go-gogs-client"
22 22
 )
23 23
 

+ 1 - 1
models/release.go

@@ -12,7 +12,7 @@ import (
12 12
 
13 13
 	"github.com/go-xorm/xorm"
14 14
 
15
-	"github.com/gogits/git-module"
15
+	"github.com/go-gitea/git"
16 16
 
17 17
 	"github.com/go-gitea/gitea/modules/process"
18 18
 )

+ 1 - 1
models/repo.go

@@ -28,7 +28,7 @@ import (
28 28
 	"github.com/go-gitea/gitea/modules/setting"
29 29
 	"github.com/go-gitea/gitea/modules/sync"
30 30
 	"github.com/go-xorm/xorm"
31
-	git "github.com/gogits/git-module"
31
+	"github.com/go-gitea/git"
32 32
 	api "github.com/gogits/go-gogs-client"
33 33
 	version "github.com/mcuadros/go-version"
34 34
 	ini "gopkg.in/ini.v1"

+ 1 - 1
models/repo_branch.go

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

+ 1 - 1
models/repo_editor.go

@@ -18,7 +18,7 @@ import (
18 18
 	"github.com/Unknwon/com"
19 19
 	gouuid "github.com/satori/go.uuid"
20 20
 
21
-	git "github.com/gogits/git-module"
21
+	"github.com/go-gitea/git"
22 22
 
23 23
 	"github.com/go-gitea/gitea/modules/log"
24 24
 	"github.com/go-gitea/gitea/modules/process"

+ 1 - 1
models/update.go

@@ -10,7 +10,7 @@ import (
10 10
 	"os/exec"
11 11
 	"strings"
12 12
 
13
-	git "github.com/gogits/git-module"
13
+	"github.com/go-gitea/git"
14 14
 
15 15
 	"github.com/go-gitea/gitea/modules/log"
16 16
 )

+ 1 - 1
models/user.go

@@ -24,7 +24,7 @@ import (
24 24
 	"github.com/go-xorm/xorm"
25 25
 	"github.com/nfnt/resize"
26 26
 
27
-	"github.com/gogits/git-module"
27
+	"github.com/go-gitea/git"
28 28
 	api "github.com/gogits/go-gogs-client"
29 29
 
30 30
 	"github.com/go-gitea/gitea/modules/avatar"

+ 1 - 1
models/webhook_slack.go

@@ -10,7 +10,7 @@ import (
10 10
 	"fmt"
11 11
 	"strings"
12 12
 
13
-	"github.com/gogits/git-module"
13
+	"github.com/go-gitea/git"
14 14
 	api "github.com/gogits/go-gogs-client"
15 15
 
16 16
 	"github.com/go-gitea/gitea/modules/setting"

+ 1 - 1
models/wiki.go

@@ -15,7 +15,7 @@ import (
15 15
 
16 16
 	"github.com/Unknwon/com"
17 17
 
18
-	"github.com/gogits/git-module"
18
+	"github.com/go-gitea/git"
19 19
 
20 20
 	"github.com/go-gitea/gitea/modules/setting"
21 21
 	"github.com/go-gitea/gitea/modules/sync"

+ 1 - 1
modules/context/repo.go

@@ -14,7 +14,7 @@ import (
14 14
 	"github.com/go-gitea/gitea/models"
15 15
 	"github.com/go-gitea/gitea/modules/log"
16 16
 	"github.com/go-gitea/gitea/modules/setting"
17
-	git "github.com/gogits/git-module"
17
+	"github.com/go-gitea/git"
18 18
 	editorconfig "gopkg.in/editorconfig/editorconfig-core-go.v1"
19 19
 	macaron "gopkg.in/macaron.v1"
20 20
 )

+ 1 - 1
routers/api/v1/convert/convert.go

@@ -9,7 +9,7 @@ import (
9 9
 
10 10
 	"github.com/Unknwon/com"
11 11
 
12
-	"github.com/gogits/git-module"
12
+	"github.com/go-gitea/git"
13 13
 	api "github.com/gogits/go-gogs-client"
14 14
 
15 15
 	"github.com/go-gitea/gitea/models"

+ 1 - 1
routers/api/v1/repo/file.go

@@ -5,7 +5,7 @@
5 5
 package repo
6 6
 
7 7
 import (
8
-	"github.com/gogits/git-module"
8
+	"github.com/go-gitea/git"
9 9
 
10 10
 	"github.com/go-gitea/gitea/models"
11 11
 	"github.com/go-gitea/gitea/modules/context"

+ 1 - 1
routers/install.go

@@ -17,7 +17,7 @@ import (
17 17
 	"gopkg.in/ini.v1"
18 18
 	"gopkg.in/macaron.v1"
19 19
 
20
-	"github.com/gogits/git-module"
20
+	"github.com/go-gitea/git"
21 21
 
22 22
 	"github.com/go-gitea/gitea/models"
23 23
 	"github.com/go-gitea/gitea/modules/auth"

+ 1 - 1
routers/repo/commit.go

@@ -13,7 +13,7 @@ import (
13 13
 	"github.com/go-gitea/gitea/modules/base"
14 14
 	"github.com/go-gitea/gitea/modules/context"
15 15
 	"github.com/go-gitea/gitea/modules/setting"
16
-	git "github.com/gogits/git-module"
16
+	"github.com/go-gitea/git"
17 17
 )
18 18
 
19 19
 const (

+ 1 - 1
routers/repo/download.go

@@ -8,7 +8,7 @@ import (
8 8
 	"io"
9 9
 	"path"
10 10
 
11
-	"github.com/gogits/git-module"
11
+	"github.com/go-gitea/git"
12 12
 
13 13
 	"github.com/go-gitea/gitea/modules/base"
14 14
 	"github.com/go-gitea/gitea/modules/context"

+ 1 - 1
routers/repo/editor.go

@@ -18,7 +18,7 @@ import (
18 18
 	"github.com/go-gitea/gitea/modules/log"
19 19
 	"github.com/go-gitea/gitea/modules/setting"
20 20
 	"github.com/go-gitea/gitea/modules/template"
21
-	git "github.com/gogits/git-module"
21
+	"github.com/go-gitea/git"
22 22
 )
23 23
 
24 24
 const (

+ 1 - 1
routers/repo/http.go

@@ -20,7 +20,7 @@ import (
20 20
 	"strings"
21 21
 	"time"
22 22
 
23
-	git "github.com/gogits/git-module"
23
+	"github.com/go-gitea/git"
24 24
 
25 25
 	"github.com/go-gitea/gitea/models"
26 26
 	"github.com/go-gitea/gitea/modules/base"

+ 1 - 1
routers/repo/middlewares.go

@@ -5,7 +5,7 @@ import (
5 5
 
6 6
 	"github.com/go-gitea/gitea/models"
7 7
 	"github.com/go-gitea/gitea/modules/context"
8
-	git "github.com/gogits/git-module"
8
+	"github.com/go-gitea/git"
9 9
 )
10 10
 
11 11
 func SetEditorconfigIfExists(ctx *context.Context) {

+ 1 - 1
routers/repo/pull.go

@@ -17,7 +17,7 @@ import (
17 17
 	"github.com/go-gitea/gitea/modules/context"
18 18
 	"github.com/go-gitea/gitea/modules/log"
19 19
 	"github.com/go-gitea/gitea/modules/setting"
20
-	git "github.com/gogits/git-module"
20
+	"github.com/go-gitea/git"
21 21
 )
22 22
 
23 23
 const (

+ 1 - 1
routers/repo/repo.go

@@ -12,7 +12,7 @@ import (
12 12
 
13 13
 	"github.com/Unknwon/com"
14 14
 
15
-	"github.com/gogits/git-module"
15
+	"github.com/go-gitea/git"
16 16
 
17 17
 	"github.com/go-gitea/gitea/models"
18 18
 	"github.com/go-gitea/gitea/modules/auth"

+ 1 - 1
routers/repo/setting.go

@@ -8,7 +8,7 @@ import (
8 8
 	"strings"
9 9
 	"time"
10 10
 
11
-	"github.com/gogits/git-module"
11
+	"github.com/go-gitea/git"
12 12
 
13 13
 	"github.com/go-gitea/gitea/models"
14 14
 	"github.com/go-gitea/gitea/modules/auth"

+ 1 - 1
routers/repo/view.go

@@ -21,7 +21,7 @@ import (
21 21
 	"github.com/go-gitea/gitea/modules/setting"
22 22
 	"github.com/go-gitea/gitea/modules/template"
23 23
 	"github.com/go-gitea/gitea/modules/template/highlight"
24
-	git "github.com/gogits/git-module"
24
+	"github.com/go-gitea/git"
25 25
 )
26 26
 
27 27
 const (

+ 1 - 1
routers/repo/webhook.go

@@ -12,7 +12,7 @@ import (
12 12
 
13 13
 	"github.com/Unknwon/com"
14 14
 
15
-	git "github.com/gogits/git-module"
15
+	"github.com/go-gitea/git"
16 16
 	api "github.com/gogits/go-gogs-client"
17 17
 
18 18
 	"github.com/go-gitea/gitea/models"

+ 1 - 1
routers/repo/wiki.go

@@ -9,7 +9,7 @@ import (
9 9
 	"strings"
10 10
 	"time"
11 11
 
12
-	"github.com/gogits/git-module"
12
+	"github.com/go-gitea/git"
13 13
 
14 14
 	"github.com/go-gitea/gitea/models"
15 15
 	"github.com/go-gitea/gitea/modules/auth"

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


+ 2 - 2
vendor/github.com/gogits/git-module/README.md

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

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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


+ 6 - 6
vendor/vendor.json

@@ -39,6 +39,12 @@
39 39
 			"revisionTime": "2016-01-17T19:21:50Z"
40 40
 		},
41 41
 		{
42
+			"checksumSHA1": "K3Gp8Tv/B8otlbsOfQp3UpJGaaE=",
43
+			"path": "github.com/go-gitea/git",
44
+			"revision": "766747ef8b271a2b1142edd0a40735f556ec2c1d",
45
+			"revisionTime": "2016-11-06T09:52:37Z"
46
+		},
47
+		{
42 48
 			"checksumSHA1": "qM/kf31cT2cxjtHxdzbu8q8jPq0=",
43 49
 			"path": "github.com/go-macaron/binding",
44 50
 			"revision": "9440f336b443056c90d7d448a0a55ad8c7599880",
@@ -147,12 +153,6 @@
147 153
 			"revisionTime": "2016-08-10T03:50:02Z"
148 154
 		},
149 155
 		{
150
-			"checksumSHA1": "PIGpfND20BlypoaFJsy2cH6urxs=",
151
-			"path": "github.com/gogits/git-module",
152
-			"revision": "b3009dc4f5842cf9e2e80fef1e125e79c38e4949",
153
-			"revisionTime": "2016-08-31T20:58:24Z"
154
-		},
155
-		{
156 156
 			"checksumSHA1": "5P4i69584LOvCooguu2D/pNxU14=",
157 157
 			"path": "github.com/gogits/go-gogs-client",
158 158
 			"revision": "d8aff570fa22d4e38954c753ec8b21862239b31d",