Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Nov 6, 2016
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8faed0
Replace gogits/git-module dependency with go-gitea/git
strk Nov 6, 2016
58ff8ea
Remove git alias for git module import (not needed)
strk Nov 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/serve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"time"

"github.com/Unknwon/com"
git "github.com/gogits/git-module"
git "github.com/go-gitea/git"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please drop this git alias everywhere, not needed anymore.

gouuid "github.com/satori/go.uuid"
"github.com/urfave/cli"

Expand Down
4 changes: 2 additions & 2 deletions cmd/web.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
git "github.com/go-gitea/git"
gogs "github.com/gogits/go-gogs-client"
version "github.com/mcuadros/go-version"
"github.com/urfave/cli"
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion models/action.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion models/git_diff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
git "github.com/go-gitea/git"
"github.com/sergi/go-diff/diffmatchpatch"
"golang.org/x/net/html/charset"
"golang.org/x/text/transform"
Expand Down
2 changes: 1 addition & 1 deletion models/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
git "github.com/go-gitea/git"
api "github.com/gogits/go-gogs-client"
)

Expand Down
2 changes: 1 addition & 1 deletion models/release.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion models/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
git "github.com/go-gitea/git"
api "github.com/gogits/go-gogs-client"
version "github.com/mcuadros/go-version"
ini "gopkg.in/ini.v1"
Expand Down
2 changes: 1 addition & 1 deletion models/repo_branch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package models

import (
"github.com/gogits/git-module"
"github.com/go-gitea/git"
)

type Branch struct {
Expand Down
2 changes: 1 addition & 1 deletion models/repo_editor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/Unknwon/com"
gouuid "github.com/satori/go.uuid"

git "github.com/gogits/git-module"
git "github.com/go-gitea/git"

"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/process"
Expand Down
2 changes: 1 addition & 1 deletion models/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"os/exec"
"strings"

git "github.com/gogits/git-module"
git "github.com/go-gitea/git"

"github.com/go-gitea/gitea/modules/log"
)
Expand Down
2 changes: 1 addition & 1 deletion models/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion models/webhook_slack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion models/wiki.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion modules/context/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
git "github.com/go-gitea/git"
editorconfig "gopkg.in/editorconfig/editorconfig-core-go.v1"
macaron "gopkg.in/macaron.v1"
)
Expand Down
2 changes: 1 addition & 1 deletion routers/api/v1/convert/convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion routers/api/v1/repo/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion routers/install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion routers/repo/commit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
git "github.com/go-gitea/git"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion routers/repo/download.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion routers/repo/editor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
git "github.com/go-gitea/git"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion routers/repo/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"strings"
"time"

git "github.com/gogits/git-module"
git "github.com/go-gitea/git"

"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/base"
Expand Down
2 changes: 1 addition & 1 deletion routers/repo/middlewares.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/context"
git "github.com/gogits/git-module"
git "github.com/go-gitea/git"
)

func SetEditorconfigIfExists(ctx *context.Context) {
Expand Down
2 changes: 1 addition & 1 deletion routers/repo/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
git "github.com/go-gitea/git"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion routers/repo/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion routers/repo/setting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion routers/repo/view.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
git "github.com/go-gitea/git"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion routers/repo/webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"github.com/Unknwon/com"

git "github.com/gogits/git-module"
git "github.com/go-gitea/git"
api "github.com/gogits/go-gogs-client"

"github.com/go-gitea/gitea/models"
Expand Down
2 changes: 1 addition & 1 deletion routers/repo/wiki.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 vendor/github.com/gogits/git-module/LICENSE → vendor/github.com/go-gitea/git/LICENSE
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...or/github.com/gogits/git-module/README.md → vendor/github.com/go-gitea/git/README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 vendor/github.com/gogits/git-module/blob.go → vendor/github.com/go-gitea/git/blob.go
View file
Open in desktop
File renamed without changes.
0 ...r/github.com/gogits/git-module/command.go → vendor/github.com/go-gitea/git/command.go
View file
Open in desktop
File renamed without changes.
0 ...or/github.com/gogits/git-module/commit.go → vendor/github.com/go-gitea/git/commit.go
View file
Open in desktop
File renamed without changes.
0 ...b.com/gogits/git-module/commit_archive.go → ...github.com/go-gitea/git/commit_archive.go
View file
Open in desktop
File renamed without changes.
0 vendor/github.com/gogits/git-module/error.go → vendor/github.com/go-gitea/git/error.go
View file
Open in desktop
File renamed without changes.
0 vendor/github.com/gogits/git-module/git.go → vendor/github.com/go-gitea/git/git.go
View file
Open in desktop
File renamed without changes.
0 vendor/github.com/gogits/git-module/hook.go → vendor/github.com/go-gitea/git/hook.go
View file
Open in desktop
File renamed without changes.
0 vendor/github.com/gogits/git-module/repo.go → vendor/github.com/go-gitea/git/repo.go
View file
Open in desktop
File renamed without changes.
0 ...thub.com/gogits/git-module/repo_branch.go → ...or/github.com/go-gitea/git/repo_branch.go
View file
Open in desktop
File renamed without changes.
0 ...thub.com/gogits/git-module/repo_commit.go → ...or/github.com/go-gitea/git/repo_commit.go
View file
Open in desktop
File renamed without changes.
0 ...github.com/gogits/git-module/repo_hook.go → vendor/github.com/go-gitea/git/repo_hook.go
View file
Open in desktop
File renamed without changes.
0 ...thub.com/gogits/git-module/repo_object.go → ...or/github.com/go-gitea/git/repo_object.go
View file
Open in desktop
File renamed without changes.
0 ...github.com/gogits/git-module/repo_pull.go → vendor/github.com/go-gitea/git/repo_pull.go
View file
Open in desktop
File renamed without changes.
0 .../github.com/gogits/git-module/repo_tag.go → vendor/github.com/go-gitea/git/repo_tag.go
View file
Open in desktop
File renamed without changes.
0 ...github.com/gogits/git-module/repo_tree.go → vendor/github.com/go-gitea/git/repo_tree.go
View file
Open in desktop
File renamed without changes.
0 vendor/github.com/gogits/git-module/sha1.go → vendor/github.com/go-gitea/git/sha1.go
View file
Open in desktop
File renamed without changes.
0 ...github.com/gogits/git-module/signature.go → vendor/github.com/go-gitea/git/signature.go
View file
Open in desktop
File renamed without changes.
0 ...github.com/gogits/git-module/submodule.go → vendor/github.com/go-gitea/git/submodule.go
View file
Open in desktop
File renamed without changes.
0 vendor/github.com/gogits/git-module/tag.go → vendor/github.com/go-gitea/git/tag.go
View file
Open in desktop
File renamed without changes.
0 vendor/github.com/gogits/git-module/tree.go → vendor/github.com/go-gitea/git/tree.go
View file
Open in desktop
File renamed without changes.
0 ...github.com/gogits/git-module/tree_blob.go → vendor/github.com/go-gitea/git/tree_blob.go
View file
Open in desktop
File renamed without changes.
0 ...ithub.com/gogits/git-module/tree_entry.go → vendor/github.com/go-gitea/git/tree_entry.go
View file
Open in desktop
File renamed without changes.
0 vendor/github.com/gogits/git-module/utlis.go → vendor/github.com/go-gitea/git/utlis.go
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions vendor/vendor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down