summaryrefslogtreecommitdiffstats
path: root/modules/git
diff options
context:
space:
mode:
authorLauris BH <lauris@nix.lv>2020-03-17 18:19:58 +0200
committerGitHub <noreply@github.com>2020-03-17 12:19:58 -0400
commit43c09134a972dc421aa06fb303697671c828cf67 (patch)
tree6bf8da5bc0a23ce516cd5598ec982b6715fb6716 /modules/git
parent2f928316dbc2bb71137e857d97039d4f51f7d405 (diff)
downloadgitea-43c09134a972dc421aa06fb303697671c828cf67.tar.gz
gitea-43c09134a972dc421aa06fb303697671c828cf67.zip
Migrate to go-git/go-git v5.0.0 (#10735)
Diffstat (limited to 'modules/git')
-rw-r--r--modules/git/blob.go2
-rw-r--r--modules/git/cache.go2
-rw-r--r--modules/git/commit.go2
-rw-r--r--modules/git/commit_info.go6
-rw-r--r--modules/git/commit_reader.go2
-rw-r--r--modules/git/notes.go2
-rw-r--r--modules/git/parse.go4
-rw-r--r--modules/git/parse_test.go4
-rw-r--r--modules/git/repo.go8
-rw-r--r--modules/git/repo_blob.go2
-rw-r--r--modules/git/repo_branch.go2
-rw-r--r--modules/git/repo_commit.go4
-rw-r--r--modules/git/repo_commitgraph.go4
-rw-r--r--modules/git/repo_language_stats.go6
-rw-r--r--modules/git/repo_ref.go4
-rw-r--r--modules/git/repo_tag.go2
-rw-r--r--modules/git/sha1.go2
-rw-r--r--modules/git/signature.go2
-rw-r--r--modules/git/tree.go4
-rw-r--r--modules/git/tree_blob.go4
-rw-r--r--modules/git/tree_entry.go6
-rw-r--r--modules/git/tree_entry_test.go4
22 files changed, 39 insertions, 39 deletions
diff --git a/modules/git/blob.go b/modules/git/blob.go
index df88ac2ede..98545f2f90 100644
--- a/modules/git/blob.go
+++ b/modules/git/blob.go
@@ -11,7 +11,7 @@ import (
"io"
"io/ioutil"
- "gopkg.in/src-d/go-git.v4/plumbing"
+ "github.com/go-git/go-git/v5/plumbing"
)
// Blob represents a Git object.
diff --git a/modules/git/cache.go b/modules/git/cache.go
index 39daf5c49d..a1f0f8a57b 100644
--- a/modules/git/cache.go
+++ b/modules/git/cache.go
@@ -4,7 +4,7 @@
package git
-import "gopkg.in/src-d/go-git.v4/plumbing/object"
+import "github.com/go-git/go-git/v5/plumbing/object"
// LastCommitCache cache
type LastCommitCache interface {
diff --git a/modules/git/commit.go b/modules/git/commit.go
index f530d7942b..e65782912f 100644
--- a/modules/git/commit.go
+++ b/modules/git/commit.go
@@ -20,7 +20,7 @@ import (
"strconv"
"strings"
- "gopkg.in/src-d/go-git.v4/plumbing/object"
+ "github.com/go-git/go-git/v5/plumbing/object"
)
// Commit represents a git commit.
diff --git a/modules/git/commit_info.go b/modules/git/commit_info.go
index 69fd7f3563..f4ba5aceb7 100644
--- a/modules/git/commit_info.go
+++ b/modules/git/commit_info.go
@@ -8,9 +8,9 @@ import (
"path"
"github.com/emirpasic/gods/trees/binaryheap"
- "gopkg.in/src-d/go-git.v4/plumbing"
- "gopkg.in/src-d/go-git.v4/plumbing/object"
- cgobject "gopkg.in/src-d/go-git.v4/plumbing/object/commitgraph"
+ "github.com/go-git/go-git/v5/plumbing"
+ "github.com/go-git/go-git/v5/plumbing/object"
+ cgobject "github.com/go-git/go-git/v5/plumbing/object/commitgraph"
)
// GetCommitsInfo gets information of all commits that are corresponding to these entries
diff --git a/modules/git/commit_reader.go b/modules/git/commit_reader.go
index 06d8f426d7..fdcb6dca84 100644
--- a/modules/git/commit_reader.go
+++ b/modules/git/commit_reader.go
@@ -10,7 +10,7 @@ import (
"io"
"strings"
- "gopkg.in/src-d/go-git.v4/plumbing"
+ "github.com/go-git/go-git/v5/plumbing"
)
// CommitFromReader will generate a Commit from a provided reader
diff --git a/modules/git/notes.go b/modules/git/notes.go
index e825923682..8184a568fa 100644
--- a/modules/git/notes.go
+++ b/modules/git/notes.go
@@ -7,7 +7,7 @@ package git
import (
"io/ioutil"
- "gopkg.in/src-d/go-git.v4/plumbing/object"
+ "github.com/go-git/go-git/v5/plumbing/object"
)
// NotesRef is the git ref where Gitea will look for git-notes data.
diff --git a/modules/git/parse.go b/modules/git/parse.go
index cbd48b9189..89b4488600 100644
--- a/modules/git/parse.go
+++ b/modules/git/parse.go
@@ -9,8 +9,8 @@ import (
"fmt"
"strconv"
- "gopkg.in/src-d/go-git.v4/plumbing/filemode"
- "gopkg.in/src-d/go-git.v4/plumbing/object"
+ "github.com/go-git/go-git/v5/plumbing/filemode"
+ "github.com/go-git/go-git/v5/plumbing/object"
)
// ParseTreeEntries parses the output of a `git ls-tree` command.
diff --git a/modules/git/parse_test.go b/modules/git/parse_test.go
index d249623949..8e0be828b3 100644
--- a/modules/git/parse_test.go
+++ b/modules/git/parse_test.go
@@ -7,9 +7,9 @@ package git
import (
"testing"
+ "github.com/go-git/go-git/v5/plumbing/filemode"
+ "github.com/go-git/go-git/v5/plumbing/object"
"github.com/stretchr/testify/assert"
- "gopkg.in/src-d/go-git.v4/plumbing/filemode"
- "gopkg.in/src-d/go-git.v4/plumbing/object"
)
func TestParseTreeEntries(t *testing.T) {
diff --git a/modules/git/repo.go b/modules/git/repo.go
index 03296d56ab..bf28288448 100644
--- a/modules/git/repo.go
+++ b/modules/git/repo.go
@@ -18,11 +18,11 @@ import (
"time"
gitealog "code.gitea.io/gitea/modules/log"
+ "github.com/go-git/go-billy/v5/osfs"
+ gogit "github.com/go-git/go-git/v5"
+ "github.com/go-git/go-git/v5/plumbing/cache"
+ "github.com/go-git/go-git/v5/storage/filesystem"
"github.com/unknwon/com"
- "gopkg.in/src-d/go-billy.v4/osfs"
- gogit "gopkg.in/src-d/go-git.v4"
- "gopkg.in/src-d/go-git.v4/plumbing/cache"
- "gopkg.in/src-d/go-git.v4/storage/filesystem"
)
// Repository represents a Git repository.
diff --git a/modules/git/repo_blob.go b/modules/git/repo_blob.go
index 45ca604402..ce0ad6b50f 100644
--- a/modules/git/repo_blob.go
+++ b/modules/git/repo_blob.go
@@ -5,7 +5,7 @@
package git
import (
- "gopkg.in/src-d/go-git.v4/plumbing"
+ "github.com/go-git/go-git/v5/plumbing"
)
func (repo *Repository) getBlob(id SHA1) (*Blob, error) {
diff --git a/modules/git/repo_branch.go b/modules/git/repo_branch.go
index 3d0e6497ed..8f9c802e01 100644
--- a/modules/git/repo_branch.go
+++ b/modules/git/repo_branch.go
@@ -9,7 +9,7 @@ import (
"fmt"
"strings"
- "gopkg.in/src-d/go-git.v4/plumbing"
+ "github.com/go-git/go-git/v5/plumbing"
)
// BranchPrefix base dir of the branch information file store on git
diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go
index 618b89438c..a7a7c66231 100644
--- a/modules/git/repo_commit.go
+++ b/modules/git/repo_commit.go
@@ -12,9 +12,9 @@ import (
"strconv"
"strings"
+ "github.com/go-git/go-git/v5/plumbing"
+ "github.com/go-git/go-git/v5/plumbing/object"
"github.com/mcuadros/go-version"
- "gopkg.in/src-d/go-git.v4/plumbing"
- "gopkg.in/src-d/go-git.v4/plumbing/object"
)
// GetRefCommitID returns the last commit ID string of given reference (branch or tag).
diff --git a/modules/git/repo_commitgraph.go b/modules/git/repo_commitgraph.go
index f3a45d8e6e..00111f5503 100644
--- a/modules/git/repo_commitgraph.go
+++ b/modules/git/repo_commitgraph.go
@@ -11,8 +11,8 @@ import (
gitealog "code.gitea.io/gitea/modules/log"
- "gopkg.in/src-d/go-git.v4/plumbing/format/commitgraph"
- cgobject "gopkg.in/src-d/go-git.v4/plumbing/object/commitgraph"
+ "github.com/go-git/go-git/v5/plumbing/format/commitgraph"
+ cgobject "github.com/go-git/go-git/v5/plumbing/object/commitgraph"
)
// CommitNodeIndex returns the index for walking commit graph
diff --git a/modules/git/repo_language_stats.go b/modules/git/repo_language_stats.go
index 305fb97795..d18ae02d8b 100644
--- a/modules/git/repo_language_stats.go
+++ b/modules/git/repo_language_stats.go
@@ -12,10 +12,10 @@ import (
"code.gitea.io/gitea/modules/analyze"
+ "github.com/go-git/go-git/v5"
+ "github.com/go-git/go-git/v5/plumbing"
+ "github.com/go-git/go-git/v5/plumbing/object"
"github.com/src-d/enry/v2"
- "gopkg.in/src-d/go-git.v4"
- "gopkg.in/src-d/go-git.v4/plumbing"
- "gopkg.in/src-d/go-git.v4/plumbing/object"
)
const fileSizeLimit int64 = 16 * 1024 * 1024
diff --git a/modules/git/repo_ref.go b/modules/git/repo_ref.go
index 9044dbeadd..be2a38c5f0 100644
--- a/modules/git/repo_ref.go
+++ b/modules/git/repo_ref.go
@@ -7,8 +7,8 @@ package git
import (
"strings"
- "gopkg.in/src-d/go-git.v4"
- "gopkg.in/src-d/go-git.v4/plumbing"
+ "github.com/go-git/go-git/v5"
+ "github.com/go-git/go-git/v5/plumbing"
)
// GetRefs returns all references of the repository.
diff --git a/modules/git/repo_tag.go b/modules/git/repo_tag.go
index f27c28ad02..7780e3477d 100644
--- a/modules/git/repo_tag.go
+++ b/modules/git/repo_tag.go
@@ -9,8 +9,8 @@ import (
"fmt"
"strings"
+ "github.com/go-git/go-git/v5/plumbing"
"github.com/mcuadros/go-version"
- "gopkg.in/src-d/go-git.v4/plumbing"
)
// TagPrefix tags prefix path on the repository
diff --git a/modules/git/sha1.go b/modules/git/sha1.go
index 57b06fe738..59b8335736 100644
--- a/modules/git/sha1.go
+++ b/modules/git/sha1.go
@@ -10,7 +10,7 @@ import (
"fmt"
"strings"
- "gopkg.in/src-d/go-git.v4/plumbing"
+ "github.com/go-git/go-git/v5/plumbing"
)
// EmptySHA defines empty git SHA
diff --git a/modules/git/signature.go b/modules/git/signature.go
index 3f67bceb09..4cb56b29f4 100644
--- a/modules/git/signature.go
+++ b/modules/git/signature.go
@@ -10,7 +10,7 @@ import (
"strconv"
"time"
- "gopkg.in/src-d/go-git.v4/plumbing/object"
+ "github.com/go-git/go-git/v5/plumbing/object"
)
// Signature represents the Author or Committer information.
diff --git a/modules/git/tree.go b/modules/git/tree.go
index 58c4d8cad1..258b11aaac 100644
--- a/modules/git/tree.go
+++ b/modules/git/tree.go
@@ -9,8 +9,8 @@ import (
"io"
"strings"
- "gopkg.in/src-d/go-git.v4/plumbing"
- "gopkg.in/src-d/go-git.v4/plumbing/object"
+ "github.com/go-git/go-git/v5/plumbing"
+ "github.com/go-git/go-git/v5/plumbing/object"
)
// Tree represents a flat directory listing.
diff --git a/modules/git/tree_blob.go b/modules/git/tree_blob.go
index cdbe031a2c..4c5a80cb36 100644
--- a/modules/git/tree_blob.go
+++ b/modules/git/tree_blob.go
@@ -9,8 +9,8 @@ import (
"path"
"strings"
- "gopkg.in/src-d/go-git.v4/plumbing/filemode"
- "gopkg.in/src-d/go-git.v4/plumbing/object"
+ "github.com/go-git/go-git/v5/plumbing/filemode"
+ "github.com/go-git/go-git/v5/plumbing/object"
)
// GetTreeEntryByPath get the tree entries according the sub dir
diff --git a/modules/git/tree_entry.go b/modules/git/tree_entry.go
index 75ff37048e..d981412095 100644
--- a/modules/git/tree_entry.go
+++ b/modules/git/tree_entry.go
@@ -10,9 +10,9 @@ import (
"sort"
"strings"
- "gopkg.in/src-d/go-git.v4/plumbing"
- "gopkg.in/src-d/go-git.v4/plumbing/filemode"
- "gopkg.in/src-d/go-git.v4/plumbing/object"
+ "github.com/go-git/go-git/v5/plumbing"
+ "github.com/go-git/go-git/v5/plumbing/filemode"
+ "github.com/go-git/go-git/v5/plumbing/object"
)
// EntryMode the type of the object in the git tree
diff --git a/modules/git/tree_entry_test.go b/modules/git/tree_entry_test.go
index e872900370..4878fce0b8 100644
--- a/modules/git/tree_entry_test.go
+++ b/modules/git/tree_entry_test.go
@@ -7,9 +7,9 @@ package git
import (
"testing"
+ "github.com/go-git/go-git/v5/plumbing/filemode"
+ "github.com/go-git/go-git/v5/plumbing/object"
"github.com/stretchr/testify/assert"
- "gopkg.in/src-d/go-git.v4/plumbing/filemode"
- "gopkg.in/src-d/go-git.v4/plumbing/object"
)
func getTestEntries() Entries {