Skip to content

Commit 6e4252d

Browse files
strkandreynering
strk
authored and
andreynering
committed
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)
1 parent 55a4d46 commit 6e4252d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+37
-37
lines changed

‎cmd/serve.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"time"
1515

1616
"github.com/Unknwon/com"
17-
git "github.com/gogits/git-module"
17+
"github.com/go-gitea/git"
1818
gouuid "github.com/satori/go.uuid"
1919
"github.com/urfave/cli"
2020

‎cmd/web.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import (
3838
"github.com/go-macaron/session"
3939
"github.com/go-macaron/toolbox"
4040
"github.com/go-xorm/xorm"
41-
git "github.com/gogits/git-module"
41+
"github.com/go-gitea/git"
4242
gogs "github.com/gogits/go-gogs-client"
4343
version "github.com/mcuadros/go-version"
4444
"github.com/urfave/cli"
@@ -93,7 +93,7 @@ func checkVersion() {
9393
{"github.com/go-macaron/toolbox", toolbox.Version, "0.1.0"},
9494
{"gopkg.in/ini.v1", ini.Version, "1.8.4"},
9595
{"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"},
9797
{"github.com/gogits/go-gogs-client", gogs.Version, "0.12.1"},
9898
}
9999
for _, c := range checkers {

‎models/action.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/Unknwon/com"
1717
"github.com/go-xorm/xorm"
1818

19-
"github.com/gogits/git-module"
19+
"github.com/go-gitea/git"
2020
api "github.com/gogits/go-gogs-client"
2121

2222
"github.com/go-gitea/gitea/modules/base"

‎models/git_diff.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"github.com/go-gitea/gitea/modules/process"
2323
"github.com/go-gitea/gitea/modules/setting"
2424
"github.com/go-gitea/gitea/modules/template/highlight"
25-
git "github.com/gogits/git-module"
25+
"github.com/go-gitea/git"
2626
"github.com/sergi/go-diff/diffmatchpatch"
2727
"golang.org/x/net/html/charset"
2828
"golang.org/x/text/transform"

‎models/pull.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/go-gitea/gitea/modules/setting"
1818
"github.com/go-gitea/gitea/modules/sync"
1919
"github.com/go-xorm/xorm"
20-
git "github.com/gogits/git-module"
20+
"github.com/go-gitea/git"
2121
api "github.com/gogits/go-gogs-client"
2222
)
2323

‎models/release.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
"github.com/go-xorm/xorm"
1414

15-
"github.com/gogits/git-module"
15+
"github.com/go-gitea/git"
1616

1717
"github.com/go-gitea/gitea/modules/process"
1818
)

‎models/repo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"github.com/go-gitea/gitea/modules/setting"
2929
"github.com/go-gitea/gitea/modules/sync"
3030
"github.com/go-xorm/xorm"
31-
git "github.com/gogits/git-module"
31+
"github.com/go-gitea/git"
3232
api "github.com/gogits/go-gogs-client"
3333
version "github.com/mcuadros/go-version"
3434
ini "gopkg.in/ini.v1"

‎models/repo_branch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package models
66

77
import (
8-
"github.com/gogits/git-module"
8+
"github.com/go-gitea/git"
99
)
1010

1111
type Branch struct {

‎models/repo_editor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/Unknwon/com"
1919
gouuid "github.com/satori/go.uuid"
2020

21-
git "github.com/gogits/git-module"
21+
"github.com/go-gitea/git"
2222

2323
"github.com/go-gitea/gitea/modules/log"
2424
"github.com/go-gitea/gitea/modules/process"

‎models/update.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"os/exec"
1111
"strings"
1212

13-
git "github.com/gogits/git-module"
13+
"github.com/go-gitea/git"
1414

1515
"github.com/go-gitea/gitea/modules/log"
1616
)

‎models/user.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/go-xorm/xorm"
2525
"github.com/nfnt/resize"
2626

27-
"github.com/gogits/git-module"
27+
"github.com/go-gitea/git"
2828
api "github.com/gogits/go-gogs-client"
2929

3030
"github.com/go-gitea/gitea/modules/avatar"

‎models/webhook_slack.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"fmt"
1111
"strings"
1212

13-
"github.com/gogits/git-module"
13+
"github.com/go-gitea/git"
1414
api "github.com/gogits/go-gogs-client"
1515

1616
"github.com/go-gitea/gitea/modules/setting"

‎models/wiki.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515

1616
"github.com/Unknwon/com"
1717

18-
"github.com/gogits/git-module"
18+
"github.com/go-gitea/git"
1919

2020
"github.com/go-gitea/gitea/modules/setting"
2121
"github.com/go-gitea/gitea/modules/sync"

‎modules/context/repo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/go-gitea/gitea/models"
1515
"github.com/go-gitea/gitea/modules/log"
1616
"github.com/go-gitea/gitea/modules/setting"
17-
git "github.com/gogits/git-module"
17+
"github.com/go-gitea/git"
1818
editorconfig "gopkg.in/editorconfig/editorconfig-core-go.v1"
1919
macaron "gopkg.in/macaron.v1"
2020
)

‎routers/api/v1/convert/convert.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"github.com/Unknwon/com"
1111

12-
"github.com/gogits/git-module"
12+
"github.com/go-gitea/git"
1313
api "github.com/gogits/go-gogs-client"
1414

1515
"github.com/go-gitea/gitea/models"

‎routers/api/v1/repo/file.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package repo
66

77
import (
8-
"github.com/gogits/git-module"
8+
"github.com/go-gitea/git"
99

1010
"github.com/go-gitea/gitea/models"
1111
"github.com/go-gitea/gitea/modules/context"

‎routers/install.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"gopkg.in/ini.v1"
1818
"gopkg.in/macaron.v1"
1919

20-
"github.com/gogits/git-module"
20+
"github.com/go-gitea/git"
2121

2222
"github.com/go-gitea/gitea/models"
2323
"github.com/go-gitea/gitea/modules/auth"

‎routers/repo/commit.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/go-gitea/gitea/modules/base"
1414
"github.com/go-gitea/gitea/modules/context"
1515
"github.com/go-gitea/gitea/modules/setting"
16-
git "github.com/gogits/git-module"
16+
"github.com/go-gitea/git"
1717
)
1818

1919
const (

‎routers/repo/download.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"io"
99
"path"
1010

11-
"github.com/gogits/git-module"
11+
"github.com/go-gitea/git"
1212

1313
"github.com/go-gitea/gitea/modules/base"
1414
"github.com/go-gitea/gitea/modules/context"

‎routers/repo/editor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/go-gitea/gitea/modules/log"
1919
"github.com/go-gitea/gitea/modules/setting"
2020
"github.com/go-gitea/gitea/modules/template"
21-
git "github.com/gogits/git-module"
21+
"github.com/go-gitea/git"
2222
)
2323

2424
const (

‎routers/repo/http.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"strings"
2121
"time"
2222

23-
git "github.com/gogits/git-module"
23+
"github.com/go-gitea/git"
2424

2525
"github.com/go-gitea/gitea/models"
2626
"github.com/go-gitea/gitea/modules/base"

‎routers/repo/middlewares.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"github.com/go-gitea/gitea/models"
77
"github.com/go-gitea/gitea/modules/context"
8-
git "github.com/gogits/git-module"
8+
"github.com/go-gitea/git"
99
)
1010

1111
func SetEditorconfigIfExists(ctx *context.Context) {

‎routers/repo/pull.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/go-gitea/gitea/modules/context"
1818
"github.com/go-gitea/gitea/modules/log"
1919
"github.com/go-gitea/gitea/modules/setting"
20-
git "github.com/gogits/git-module"
20+
"github.com/go-gitea/git"
2121
)
2222

2323
const (

‎routers/repo/repo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
"github.com/Unknwon/com"
1414

15-
"github.com/gogits/git-module"
15+
"github.com/go-gitea/git"
1616

1717
"github.com/go-gitea/gitea/models"
1818
"github.com/go-gitea/gitea/modules/auth"

‎routers/repo/setting.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"strings"
99
"time"
1010

11-
"github.com/gogits/git-module"
11+
"github.com/go-gitea/git"
1212

1313
"github.com/go-gitea/gitea/models"
1414
"github.com/go-gitea/gitea/modules/auth"

‎routers/repo/view.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"github.com/go-gitea/gitea/modules/setting"
2222
"github.com/go-gitea/gitea/modules/template"
2323
"github.com/go-gitea/gitea/modules/template/highlight"
24-
git "github.com/gogits/git-module"
24+
"github.com/go-gitea/git"
2525
)
2626

2727
const (

‎routers/repo/webhook.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
"github.com/Unknwon/com"
1414

15-
git "github.com/gogits/git-module"
15+
"github.com/go-gitea/git"
1616
api "github.com/gogits/go-gogs-client"
1717

1818
"github.com/go-gitea/gitea/models"

‎routers/repo/wiki.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"strings"
1010
"time"
1111

12-
"github.com/gogits/git-module"
12+
"github.com/go-gitea/git"
1313

1414
"github.com/go-gitea/gitea/models"
1515
"github.com/go-gitea/gitea/modules/auth"

‎vendor/github.com/gogits/git-module/LICENSE renamed to ‎vendor/github.com/go-gitea/git/LICENSE

File renamed without changes.

‎vendor/github.com/gogits/git-module/README.md renamed to ‎vendor/github.com/go-gitea/git/README.md

Lines changed: 2 additions & 2 deletions

‎vendor/github.com/gogits/git-module/blob.go renamed to ‎vendor/github.com/go-gitea/git/blob.go

File renamed without changes.

‎vendor/github.com/gogits/git-module/command.go renamed to ‎vendor/github.com/go-gitea/git/command.go

File renamed without changes.

‎vendor/github.com/gogits/git-module/commit.go renamed to ‎vendor/github.com/go-gitea/git/commit.go

File renamed without changes.

‎vendor/github.com/gogits/git-module/commit_archive.go renamed to ‎vendor/github.com/go-gitea/git/commit_archive.go

File renamed without changes.

‎vendor/github.com/gogits/git-module/error.go renamed to ‎vendor/github.com/go-gitea/git/error.go

File renamed without changes.

‎vendor/github.com/gogits/git-module/git.go renamed to ‎vendor/github.com/go-gitea/git/git.go

File renamed without changes.

‎vendor/github.com/gogits/git-module/hook.go renamed to ‎vendor/github.com/go-gitea/git/hook.go

File renamed without changes.

‎vendor/github.com/gogits/git-module/repo.go renamed to ‎vendor/github.com/go-gitea/git/repo.go

File renamed without changes.

‎vendor/github.com/gogits/git-module/repo_branch.go renamed to ‎vendor/github.com/go-gitea/git/repo_branch.go

File renamed without changes.

‎vendor/github.com/gogits/git-module/repo_commit.go renamed to ‎vendor/github.com/go-gitea/git/repo_commit.go

File renamed without changes.

‎vendor/github.com/gogits/git-module/repo_hook.go renamed to ‎vendor/github.com/go-gitea/git/repo_hook.go

File renamed without changes.

‎vendor/github.com/gogits/git-module/repo_object.go renamed to ‎vendor/github.com/go-gitea/git/repo_object.go

File renamed without changes.

‎vendor/github.com/gogits/git-module/repo_pull.go renamed to ‎vendor/github.com/go-gitea/git/repo_pull.go

File renamed without changes.

‎vendor/github.com/gogits/git-module/repo_tag.go renamed to ‎vendor/github.com/go-gitea/git/repo_tag.go

File renamed without changes.

‎vendor/github.com/gogits/git-module/repo_tree.go renamed to ‎vendor/github.com/go-gitea/git/repo_tree.go

File renamed without changes.

‎vendor/github.com/gogits/git-module/sha1.go renamed to ‎vendor/github.com/go-gitea/git/sha1.go

File renamed without changes.

‎vendor/github.com/gogits/git-module/signature.go renamed to ‎vendor/github.com/go-gitea/git/signature.go

File renamed without changes.

‎vendor/github.com/gogits/git-module/submodule.go renamed to ‎vendor/github.com/go-gitea/git/submodule.go

File renamed without changes.

‎vendor/github.com/gogits/git-module/tag.go renamed to ‎vendor/github.com/go-gitea/git/tag.go

File renamed without changes.

‎vendor/github.com/gogits/git-module/tree.go renamed to ‎vendor/github.com/go-gitea/git/tree.go

File renamed without changes.

‎vendor/github.com/gogits/git-module/tree_blob.go renamed to ‎vendor/github.com/go-gitea/git/tree_blob.go

File renamed without changes.

‎vendor/github.com/gogits/git-module/tree_entry.go renamed to ‎vendor/github.com/go-gitea/git/tree_entry.go

File renamed without changes.

‎vendor/github.com/gogits/git-module/utlis.go renamed to ‎vendor/github.com/go-gitea/git/utlis.go

File renamed without changes.

‎vendor/vendor.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@
3838
"revision": "fb1f79c6b65acda83063cbc69f6bba1522558bfc",
3939
"revisionTime": "2016-01-17T19:21:50Z"
4040
},
41+
{
42+
"checksumSHA1": "K3Gp8Tv/B8otlbsOfQp3UpJGaaE=",
43+
"path": "github.com/go-gitea/git",
44+
"revision": "766747ef8b271a2b1142edd0a40735f556ec2c1d",
45+
"revisionTime": "2016-11-06T09:52:37Z"
46+
},
4147
{
4248
"checksumSHA1": "qM/kf31cT2cxjtHxdzbu8q8jPq0=",
4349
"path": "github.com/go-macaron/binding",
@@ -146,12 +152,6 @@
146152
"revision": "7f3990acf1833faa5ebd0e86f0a4c72a4b5eba3c",
147153
"revisionTime": "2016-08-10T03:50:02Z"
148154
},
149-
{
150-
"checksumSHA1": "PIGpfND20BlypoaFJsy2cH6urxs=",
151-
"path": "github.com/gogits/git-module",
152-
"revision": "b3009dc4f5842cf9e2e80fef1e125e79c38e4949",
153-
"revisionTime": "2016-08-31T20:58:24Z"
154-
},
155155
{
156156
"checksumSHA1": "5P4i69584LOvCooguu2D/pNxU14=",
157157
"path": "github.com/gogits/go-gogs-client",

0 commit comments

Comments
 (0)