Merge pull request #165 from antham/upgrade

antham · web-flow · commit dd9ec4022822 · 2025-02-09T18:20:17.000+01:00
Upgrade library
diff --git a/chyle/git/git.go b/chyle/git/git.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strings"
 
-	"gopkg.in/src-d/go-git.v4"
-	"gopkg.in/src-d/go-git.v4/plumbing"
-	"gopkg.in/src-d/go-git.v4/plumbing/object"
+	"github.com/go-git/go-git/v5"
+	"github.com/go-git/go-git/v5/plumbing"
+	"github.com/go-git/go-git/v5/plumbing/object"
 )
 
 // node is a tree node in commit tree
diff --git a/chyle/git/git_test.go b/chyle/git/git_test.go
@@ -8,10 +8,10 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
+	"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/sirupsen/logrus"
-	"gopkg.in/src-d/go-git.v4"
-	"gopkg.in/src-d/go-git.v4/plumbing"
-	"gopkg.in/src-d/go-git.v4/plumbing/object"
 )
 
 var (
diff --git a/chyle/matchers/author.go b/chyle/matchers/author.go
@@ -3,7 +3,7 @@ package matchers
 import (
 	"regexp"
 
-	"gopkg.in/src-d/go-git.v4/plumbing/object"
+	"github.com/go-git/go-git/v5/plumbing/object"
 )
 
 // author is commit author matcher
diff --git a/chyle/matchers/committer.go b/chyle/matchers/committer.go
@@ -3,7 +3,7 @@ package matchers
 import (
 	"regexp"
 
-	"gopkg.in/src-d/go-git.v4/plumbing/object"
+	"github.com/go-git/go-git/v5/plumbing/object"
 )
 
 // committer is commit committer matcher
diff --git a/chyle/matchers/matcher.go b/chyle/matchers/matcher.go
@@ -1,7 +1,7 @@
 package matchers
 
 import (
-	"gopkg.in/src-d/go-git.v4/plumbing/object"
+	"github.com/go-git/go-git/v5/plumbing/object"
 )
 
 // Matcher describes a way of applying a matcher against a commit
diff --git a/chyle/matchers/matcher_test.go b/chyle/matchers/matcher_test.go
@@ -6,9 +6,9 @@ import (
 	"regexp"
 	"testing"
 
+	"github.com/go-git/go-git/v5/plumbing"
+	"github.com/go-git/go-git/v5/plumbing/object"
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/src-d/go-git.v4/plumbing"
-	"gopkg.in/src-d/go-git.v4/plumbing/object"
 )
 
 type buffer struct {
diff --git a/chyle/matchers/message.go b/chyle/matchers/message.go
@@ -3,7 +3,7 @@ package matchers
 import (
 	"regexp"
 
-	"gopkg.in/src-d/go-git.v4/plumbing/object"
+	"github.com/go-git/go-git/v5/plumbing/object"
 )
 
 // message is commit message matcher
diff --git a/chyle/matchers/type.go b/chyle/matchers/type.go
@@ -1,7 +1,7 @@
 package matchers
 
 import (
-	"gopkg.in/src-d/go-git.v4/plumbing/object"
+	"github.com/go-git/go-git/v5/plumbing/object"
 )
 
 const (
diff --git a/chyle/process.go b/chyle/process.go
@@ -7,7 +7,7 @@ import (
 	"github.com/antham/chyle/chyle/matchers"
 	"github.com/antham/chyle/chyle/senders"
 
-	"gopkg.in/src-d/go-git.v4/plumbing/object"
+	"github.com/go-git/go-git/v5/plumbing/object"
 )
 
 // process represents all steps executed
diff --git a/chyle/process_test.go b/chyle/process_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/antham/chyle/chyle/senders"
 	"github.com/antham/chyle/chyle/types"
 
-	"gopkg.in/src-d/go-git.v4/plumbing/object"
+	"github.com/go-git/go-git/v5/plumbing/object"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/go.mod b/go.mod
@@ -9,20 +9,27 @@ require (
 	github.com/antham/envh v1.5.0
 	github.com/antham/strumt/v2 v2.3.0
 	github.com/fatih/color v1.18.0
+	github.com/go-git/go-git/v5 v5.13.2
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.8.1
 	github.com/stretchr/testify v1.10.0
 	github.com/tidwall/gjson v1.18.0
 	gopkg.in/h2non/gock.v0 v0.1.6
-	gopkg.in/src-d/go-git.v4 v4.13.1
 )
 
 require (
+	dario.cat/mergo v1.0.1 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver v1.5.0 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
+	github.com/ProtonMail/go-crypto v1.1.5 // indirect
+	github.com/cloudflare/circl v1.3.7 // indirect
+	github.com/cyphar/filepath-securejoin v0.3.6 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
+	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
+	github.com/go-git/go-billy/v5 v5.6.2 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/huandu/xstrings v1.5.0 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
@@ -32,20 +39,19 @@ require (
 	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
-	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 // indirect
+	github.com/pjbgf/sha1cd v0.3.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/sergi/go-diff v1.3.1 // indirect
+	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
+	github.com/skeema/knownhosts v1.3.0 // indirect
 	github.com/spf13/pflag v1.0.6 // indirect
-	github.com/src-d/gcfg v1.4.0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	golang.org/x/crypto v0.33.0 // indirect
 	golang.org/x/net v0.34.0 // indirect
 	golang.org/x/sys v0.30.0 // indirect
-	gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package matchers`
`3`	`3`	`import (`
`4`	`4`	`"regexp"`
`5`	`5`
`6`		`- "gopkg.in/src-d/go-git.v4/plumbing/object"`
	`6`	`+ "github.com/go-git/go-git/v5/plumbing/object"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`// author is commit author matcher`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package matchers`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "gopkg.in/src-d/go-git.v4/plumbing/object"`
	`4`	`+ "github.com/go-git/go-git/v5/plumbing/object"`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`// Matcher describes a way of applying a matcher against a commit`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"github.com/antham/chyle/chyle/matchers"`
`8`	`8`	`"github.com/antham/chyle/chyle/senders"`
`9`	`9`
`10`		`- "gopkg.in/src-d/go-git.v4/plumbing/object"`
	`10`	`+ "github.com/go-git/go-git/v5/plumbing/object"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`// process represents all steps executed`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`"github.com/antham/chyle/chyle/senders"`
`13`	`13`	`"github.com/antham/chyle/chyle/types"`
`14`	`14`
`15`		`- "gopkg.in/src-d/go-git.v4/plumbing/object"`
	`15`	`+ "github.com/go-git/go-git/v5/plumbing/object"`
`16`	`16`
`17`	`17`	`"github.com/stretchr/testify/assert"`
`18`	`18`	`)`
-Original file line number
+Diff line change
 	github.com/antham/envh v1.5.0
 	github.com/antham/strumt/v2 v2.3.0
 	github.com/fatih/color v1.18.0
 +	github.com/go-git/go-git/v5 v5.13.2
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.8.1
 	github.com/stretchr/testify v1.10.0
 	github.com/tidwall/gjson v1.18.0
 	gopkg.in/h2non/gock.v0 v0.1.6
 -	gopkg.in/src-d/go-git.v4 v4.13.1
+)
 require (
 +	dario.cat/mergo v1.0.1 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver v1.5.0 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 +	github.com/ProtonMail/go-crypto v1.1.5 // indirect
 +	github.com/cloudflare/circl v1.3.7 // indirect
 +	github.com/cyphar/filepath-securejoin v0.3.6 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
 +	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 +	github.com/go-git/go-billy/v5 v5.6.2 // indirect
 +	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/huandu/xstrings v1.5.0 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 -	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 // indirect
 +	github.com/pjbgf/sha1cd v0.3.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 -	github.com/sergi/go-diff v1.3.1 // indirect
 +	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
 +	github.com/skeema/knownhosts v1.3.0 // indirect
 	github.com/spf13/pflag v1.0.6 // indirect
 -	github.com/src-d/gcfg v1.4.0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	golang.org/x/crypto v0.33.0 // indirect
 	golang.org/x/net v0.34.0 // indirect
 	golang.org/x/sys v0.30.0 // indirect
 -	gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
+)