mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-06-20 01:19:23 +02:00
Bump dario.cat/mergo from 1.0.1 to 1.0.2 (#5484)
[//]: # (dependabot-start) ⚠️ **Dependabot is rebasing this PR** ⚠️ Rebasing might not happen immediately, so don't worry if this takes some time. Note: if you make any changes to this PR yourself, they will take precedence over the rebase. --- [//]: # (dependabot-end) Bumps [dario.cat/mergo](https://github.com/imdario/mergo) from 1.0.1 to 1.0.2. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/imdario/mergo/releases">dario.cat/mergo's releases</a>.</em></p> <blockquote> <h2>v1.0.2</h2> <h2>What's Changed</h2> <ul> <li>Drops <code>gopkg.in/yaml.v3</code>, only used for loading fixtures. Thanks <a href="https://github.com/trim21"><code>@trim21</code></a> for bringing to my attention (<a href="https://redirect.github.com/imdario/mergo/issues/262">#262</a>) that this library is no longer maintained.</li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/darccio/mergo/compare/v1.0.1...v1.0.2">https://github.com/darccio/mergo/compare/v1.0.1...v1.0.2</a></p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/darccio/mergo/commit/7b33b2b01026fbbbbfcfbb1ee2c9c0a5e0c9a9f7"><code>7b33b2b</code></a> refactor: migrate from YAML to JSON for test data and update related functions</li> <li><a href="https://github.com/darccio/mergo/commit/229a2148678d4519fffd30dff24685551e57544a"><code>229a214</code></a> chore(.well-known): add funding manifest URLs file</li> <li><a href="https://github.com/darccio/mergo/commit/6be20c6d7d20645054fcc648b9226ae11d48ad27"><code>6be20c6</code></a> chore(SECURITY.md): update supported versions to reflect current versioning</li> <li><a href="https://github.com/darccio/mergo/commit/9007623e5248b4a61fff3b3969168d1dc313df9e"><code>9007623</code></a> chore(README) : remove kubernetes from the list of users</li> <li><a href="https://github.com/darccio/mergo/commit/2b1eb9c67d7332f286430af241180c5005a6a5a4"><code>2b1eb9c</code></a> Update FUNDING.yml</li> <li><a href="https://github.com/darccio/mergo/commit/2ceb99467bfe70a74b30b1194774ac63f1888632"><code>2ceb994</code></a> Create FUNDING.json</li> <li>See full diff in <a href="https://github.com/imdario/mergo/compare/v1.0.1...v1.0.2">compare view</a></li> </ul> </details> <br />
This commit is contained in:
@@ -6,7 +6,7 @@ go 1.25.0
|
||||
ignore ./test
|
||||
|
||||
require (
|
||||
dario.cat/mergo v1.0.1
|
||||
dario.cat/mergo v1.0.2
|
||||
github.com/adrg/xdg v0.5.3
|
||||
github.com/atotto/clipboard v0.1.4
|
||||
github.com/aybabtme/humanlog v0.4.1
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
|
||||
dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
|
||||
dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8=
|
||||
dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA=
|
||||
github.com/adrg/xdg v0.5.3 h1:xRnxJXne7+oWDatRhR1JLnvuccuIeCoBu2rtuLqQB78=
|
||||
github.com/adrg/xdg v0.5.3/go.mod h1:nlTsY+NNiCBGCK2tpm09vRqfVzrc2fLmXGpBLF0zlTQ=
|
||||
github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
|
||||
|
||||
Vendored
+7
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"drips": {
|
||||
"ethereum": {
|
||||
"ownedBy": "0x6160020e7102237aC41bdb156e94401692D76930"
|
||||
}
|
||||
}
|
||||
}
|
||||
Vendored
-5
@@ -85,7 +85,6 @@ Mergo is used by [thousands](https://deps.dev/go/dario.cat%2Fmergo/v1.0.0/depend
|
||||
* [goreleaser/goreleaser](https://github.com/goreleaser/goreleaser)
|
||||
* [go-micro/go-micro](https://github.com/go-micro/go-micro)
|
||||
* [grafana/loki](https://github.com/grafana/loki)
|
||||
* [kubernetes/kubernetes](https://github.com/kubernetes/kubernetes)
|
||||
* [masterminds/sprig](github.com/Masterminds/sprig)
|
||||
* [moby/moby](https://github.com/moby/moby)
|
||||
* [slackhq/nebula](https://github.com/slackhq/nebula)
|
||||
@@ -191,10 +190,6 @@ func main() {
|
||||
}
|
||||
```
|
||||
|
||||
Note: if test are failing due missing package, please execute:
|
||||
|
||||
go get gopkg.in/yaml.v3
|
||||
|
||||
### Transformers
|
||||
|
||||
Transformers allow to merge specific types differently than in the default behavior. In other words, now you can customize how some types are merged. For example, `time.Time` is a struct; it doesn't have zero value but IsZero can return true because it has fields with zero value. How can we merge a non-zero `time.Time`?
|
||||
|
||||
Vendored
+2
-2
@@ -4,8 +4,8 @@
|
||||
|
||||
| Version | Supported |
|
||||
| ------- | ------------------ |
|
||||
| 0.3.x | :white_check_mark: |
|
||||
| < 0.3 | :x: |
|
||||
| 1.x.x | :white_check_mark: |
|
||||
| < 1.0 | :x: |
|
||||
|
||||
## Security contact information
|
||||
|
||||
|
||||
Vendored
+1
-1
@@ -1,4 +1,4 @@
|
||||
# dario.cat/mergo v1.0.1
|
||||
# dario.cat/mergo v1.0.2
|
||||
## explicit; go 1.13
|
||||
dario.cat/mergo
|
||||
# github.com/adrg/xdg v0.5.3
|
||||
|
||||
Reference in New Issue
Block a user