Skip to content

Commit b78aa54

Browse files
committed
Use dario.cat/mergo instead of github.com/imdario/mergo
It's the new canonical location as of 1.0.0, the old one is deprecated and stuck on 0.3.something.
1 parent 4cf49ff commit b78aa54

File tree

12 files changed

+2
-1138
lines changed

12 files changed

+2
-1138
lines changed

Diff for: go.mod

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module github.com/jesseduffield/lazygit
33
go 1.24.0
44

55
require (
6+
dario.cat/mergo v1.0.1
67
github.com/adrg/xdg v0.4.0
78
github.com/atotto/clipboard v0.1.4
89
github.com/aybabtme/humanlog v0.4.1
@@ -11,7 +12,6 @@ require (
1112
github.com/gdamore/tcell/v2 v2.8.1
1213
github.com/go-errors/errors v1.5.1
1314
github.com/gookit/color v1.4.2
14-
github.com/imdario/mergo v0.3.11
1515
github.com/integrii/flaggy v1.4.0
1616
github.com/jesseduffield/generics v0.0.0-20250406224309-4f541cb84918
1717
github.com/jesseduffield/go-git/v5 v5.14.1-0.20250407170251-e1a013310ccd
@@ -43,7 +43,6 @@ require (
4343
)
4444

4545
require (
46-
dario.cat/mergo v1.0.1 // indirect
4746
github.com/Microsoft/go-winio v0.6.2 // indirect
4847
github.com/ProtonMail/go-crypto v1.1.6 // indirect
4948
github.com/bahlo/generic-list-go v0.2.0 // indirect

Diff for: go.sum

-4
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,6 @@ github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
184184
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
185185
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
186186
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
187-
github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA=
188-
github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
189187
github.com/integrii/flaggy v1.4.0 h1:A1x7SYx4jqu5NSrY14z8Z+0UyX2S5ygfJJrfolWR3zM=
190188
github.com/integrii/flaggy v1.4.0/go.mod h1:tnTxHeTJbah0gQ6/K0RW0J7fMUBk9MCF5blhm43LNpI=
191189
github.com/invopop/jsonschema v0.10.0 h1:c1ktzNLBun3LyQQhyty5WE3lulbOdIIyOVlkmDLehcE=
@@ -682,8 +680,6 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWD
682680
gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
683681
gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
684682
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
685-
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
686-
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
687683
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
688684
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
689685
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

Diff for: pkg/i18n/i18n.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"io/fs"
88
"strings"
99

10+
"dario.cat/mergo"
1011
"github.com/cloudfoundry/jibber_jabber"
1112
"github.com/go-errors/errors"
12-
"github.com/imdario/mergo"
1313
"github.com/samber/lo"
1414
"github.com/sirupsen/logrus"
1515
)

Diff for: vendor/github.com/imdario/mergo/.gitignore

-33
This file was deleted.

Diff for: vendor/github.com/imdario/mergo/CODE_OF_CONDUCT.md

-46
This file was deleted.

Diff for: vendor/github.com/imdario/mergo/LICENSE

-28
This file was deleted.

0 commit comments

Comments
 (0)