Skip to content

Commit 0f0eee7

Browse files
Bump github.com/go-git/go-git/v5 from 5.6.0 to 5.13.0
Bumps [github.com/go-git/go-git/v5](https://github.com/go-git/go-git) from 5.6.0 to 5.13.0. - [Release notes](https://github.com/go-git/go-git/releases) - [Commits](go-git/go-git@v5.6.0...v5.13.0) --- updated-dependencies: - dependency-name: github.com/go-git/go-git/v5 dependency-version: 5.13.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
1 parent 3e56b9a commit 0f0eee7

File tree

351 files changed

+63720
-4240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

351 files changed

+63720
-4240
lines changed

go.mod

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,38 @@ require (
66
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d
77
github.com/bmatcuk/doublestar/v4 v4.8.1
88
github.com/cenkalti/backoff v2.2.1+incompatible
9-
github.com/go-git/go-git/v5 v5.6.0
9+
github.com/go-git/go-git/v5 v5.13.0
1010
github.com/heroku/heroku-go/v5 v5.5.0
1111
github.com/otiai10/copy v1.9.0
1212
github.com/spf13/cobra v1.9.1
1313
)
1414

1515
require (
16-
github.com/Microsoft/go-winio v0.5.2 // indirect
17-
github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 // indirect
18-
github.com/acomagu/bufpipe v1.0.3 // indirect
16+
dario.cat/mergo v1.0.0 // indirect
17+
github.com/Microsoft/go-winio v0.6.1 // indirect
18+
github.com/ProtonMail/go-crypto v1.1.3 // indirect
1919
github.com/cloudflare/circl v1.3.7 // indirect
20+
github.com/cyphar/filepath-securejoin v0.2.5 // indirect
2021
github.com/emirpasic/gods v1.18.1 // indirect
21-
github.com/go-git/gcfg v1.5.0 // indirect
22-
github.com/go-git/go-billy/v5 v5.4.0 // indirect
22+
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
23+
github.com/go-git/go-billy/v5 v5.6.0 // indirect
24+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
2325
github.com/google/go-querystring v1.1.0 // indirect
2426
github.com/google/uuid v1.3.0 // indirect
25-
github.com/imdario/mergo v0.3.13 // indirect
2627
github.com/inconshreveable/mousetrap v1.1.0 // indirect
2728
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
2829
github.com/kevinburke/ssh_config v1.2.0 // indirect
2930
github.com/pborman/uuid v1.2.1 // indirect
3031
github.com/pjbgf/sha1cd v0.3.0 // indirect
31-
github.com/sergi/go-diff v1.1.0 // indirect
32-
github.com/skeema/knownhosts v1.1.0 // indirect
32+
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
33+
github.com/skeema/knownhosts v1.3.0 // indirect
3334
github.com/spf13/pflag v1.0.6 // indirect
34-
github.com/stretchr/testify v1.7.1-0.20210427113832-6241f9ab9942 // indirect
3535
github.com/xanzy/ssh-agent v0.3.3 // indirect
3636
golang.org/x/crypto v0.36.0 // indirect
37+
golang.org/x/mod v0.17.0 // indirect
3738
golang.org/x/net v0.38.0 // indirect
39+
golang.org/x/sync v0.10.0 // indirect
3840
golang.org/x/sys v0.31.0 // indirect
41+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
3942
gopkg.in/warnings.v0 v0.1.2 // indirect
4043
)

go.sum

Lines changed: 45 additions & 83 deletions
Large diffs are not rendered by default.

vendor/github.com/imdario/mergo/.deepsource.toml renamed to vendor/dario.cat/mergo/.deepsource.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ name = "go"
99
enabled = true
1010

1111
[analyzers.meta]
12-
import_path = "github.com/imdario/mergo"
12+
import_path = "dario.cat/mergo"
Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
<!-- omit in toc -->
2+
# Contributing to mergo
3+
4+
First off, thanks for taking the time to contribute! ❤️
5+
6+
All types of contributions are encouraged and valued. See the [Table of Contents](#table-of-contents) for different ways to help and details about how this project handles them. Please make sure to read the relevant section before making your contribution. It will make it a lot easier for us maintainers and smooth out the experience for all involved. The community looks forward to your contributions. 🎉
7+
8+
> And if you like the project, but just don't have time to contribute, that's fine. There are other easy ways to support the project and show your appreciation, which we would also be very happy about:
9+
> - Star the project
10+
> - Tweet about it
11+
> - Refer this project in your project's readme
12+
> - Mention the project at local meetups and tell your friends/colleagues
13+
14+
<!-- omit in toc -->
15+
## Table of Contents
16+
17+
- [Code of Conduct](#code-of-conduct)
18+
- [I Have a Question](#i-have-a-question)
19+
- [I Want To Contribute](#i-want-to-contribute)
20+
- [Reporting Bugs](#reporting-bugs)
21+
- [Suggesting Enhancements](#suggesting-enhancements)
22+
23+
## Code of Conduct
24+
25+
This project and everyone participating in it is governed by the
26+
[mergo Code of Conduct](https://github.com/imdario/mergoblob/master/CODE_OF_CONDUCT.md).
27+
By participating, you are expected to uphold this code. Please report unacceptable behavior
28+
to <>.
29+
30+
31+
## I Have a Question
32+
33+
> If you want to ask a question, we assume that you have read the available [Documentation](https://pkg.go.dev/github.com/imdario/mergo).
34+
35+
Before you ask a question, it is best to search for existing [Issues](https://github.com/imdario/mergo/issues) that might help you. In case you have found a suitable issue and still need clarification, you can write your question in this issue. It is also advisable to search the internet for answers first.
36+
37+
If you then still feel the need to ask a question and need clarification, we recommend the following:
38+
39+
- Open an [Issue](https://github.com/imdario/mergo/issues/new).
40+
- Provide as much context as you can about what you're running into.
41+
- Provide project and platform versions (nodejs, npm, etc), depending on what seems relevant.
42+
43+
We will then take care of the issue as soon as possible.
44+
45+
## I Want To Contribute
46+
47+
> ### Legal Notice <!-- omit in toc -->
48+
> When contributing to this project, you must agree that you have authored 100% of the content, that you have the necessary rights to the content and that the content you contribute may be provided under the project license.
49+
50+
### Reporting Bugs
51+
52+
<!-- omit in toc -->
53+
#### Before Submitting a Bug Report
54+
55+
A good bug report shouldn't leave others needing to chase you up for more information. Therefore, we ask you to investigate carefully, collect information and describe the issue in detail in your report. Please complete the following steps in advance to help us fix any potential bug as fast as possible.
56+
57+
- Make sure that you are using the latest version.
58+
- Determine if your bug is really a bug and not an error on your side e.g. using incompatible environment components/versions (Make sure that you have read the [documentation](). If you are looking for support, you might want to check [this section](#i-have-a-question)).
59+
- To see if other users have experienced (and potentially already solved) the same issue you are having, check if there is not already a bug report existing for your bug or error in the [bug tracker](https://github.com/imdario/mergoissues?q=label%3Abug).
60+
- Also make sure to search the internet (including Stack Overflow) to see if users outside of the GitHub community have discussed the issue.
61+
- Collect information about the bug:
62+
- Stack trace (Traceback)
63+
- OS, Platform and Version (Windows, Linux, macOS, x86, ARM)
64+
- Version of the interpreter, compiler, SDK, runtime environment, package manager, depending on what seems relevant.
65+
- Possibly your input and the output
66+
- Can you reliably reproduce the issue? And can you also reproduce it with older versions?
67+
68+
<!-- omit in toc -->
69+
#### How Do I Submit a Good Bug Report?
70+
71+
> You must never report security related issues, vulnerabilities or bugs including sensitive information to the issue tracker, or elsewhere in public. Instead sensitive bugs must be sent by email to .
72+
<!-- You may add a PGP key to allow the messages to be sent encrypted as well. -->
73+
74+
We use GitHub issues to track bugs and errors. If you run into an issue with the project:
75+
76+
- Open an [Issue](https://github.com/imdario/mergo/issues/new). (Since we can't be sure at this point whether it is a bug or not, we ask you not to talk about a bug yet and not to label the issue.)
77+
- Explain the behavior you would expect and the actual behavior.
78+
- Please provide as much context as possible and describe the *reproduction steps* that someone else can follow to recreate the issue on their own. This usually includes your code. For good bug reports you should isolate the problem and create a reduced test case.
79+
- Provide the information you collected in the previous section.
80+
81+
Once it's filed:
82+
83+
- The project team will label the issue accordingly.
84+
- A team member will try to reproduce the issue with your provided steps. If there are no reproduction steps or no obvious way to reproduce the issue, the team will ask you for those steps and mark the issue as `needs-repro`. Bugs with the `needs-repro` tag will not be addressed until they are reproduced.
85+
- If the team is able to reproduce the issue, it will be marked `needs-fix`, as well as possibly other tags (such as `critical`), and the issue will be left to be implemented by someone.
86+
87+
### Suggesting Enhancements
88+
89+
This section guides you through submitting an enhancement suggestion for mergo, **including completely new features and minor improvements to existing functionality**. Following these guidelines will help maintainers and the community to understand your suggestion and find related suggestions.
90+
91+
<!-- omit in toc -->
92+
#### Before Submitting an Enhancement
93+
94+
- Make sure that you are using the latest version.
95+
- Read the [documentation]() carefully and find out if the functionality is already covered, maybe by an individual configuration.
96+
- Perform a [search](https://github.com/imdario/mergo/issues) to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
97+
- Find out whether your idea fits with the scope and aims of the project. It's up to you to make a strong case to convince the project's developers of the merits of this feature. Keep in mind that we want features that will be useful to the majority of our users and not just a small subset. If you're just targeting a minority of users, consider writing an add-on/plugin library.
98+
99+
<!-- omit in toc -->
100+
#### How Do I Submit a Good Enhancement Suggestion?
101+
102+
Enhancement suggestions are tracked as [GitHub issues](https://github.com/imdario/mergo/issues).
103+
104+
- Use a **clear and descriptive title** for the issue to identify the suggestion.
105+
- Provide a **step-by-step description of the suggested enhancement** in as many details as possible.
106+
- **Describe the current behavior** and **explain which behavior you expected to see instead** and why. At this point you can also tell which alternatives do not work for you.
107+
- You may want to **include screenshots and animated GIFs** which help you demonstrate the steps or point out the part which the suggestion is related to. You can use [this tool](https://www.cockos.com/licecap/) to record GIFs on macOS and Windows, and [this tool](https://github.com/colinkeenan/silentcast) or [this tool](https://github.com/GNOME/byzanz) on Linux. <!-- this should only be included if the project has a GUI -->
108+
- **Explain why this enhancement would be useful** to most mergo users. You may also want to point out the other projects that solved it better and which could serve as inspiration.
109+
110+
<!-- omit in toc -->
111+
## Attribution
112+
This guide is based on the **contributing-gen**. [Make your own](https://github.com/bttger/contributing-gen)!

vendor/github.com/imdario/mergo/README.md renamed to vendor/dario.cat/mergo/README.md

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
# Mergo
22

3-
4-
[![GoDoc][3]][4]
53
[![GitHub release][5]][6]
64
[![GoCard][7]][8]
7-
[![Build Status][1]][2]
8-
[![Coverage Status][9]][10]
5+
[![Test status][1]][2]
6+
[![OpenSSF Scorecard][21]][22]
7+
[![OpenSSF Best Practices][19]][20]
8+
[![Coverage status][9]][10]
99
[![Sourcegraph][11]][12]
10-
[![FOSSA Status][13]][14]
10+
[![FOSSA status][13]][14]
11+
12+
[![GoDoc][3]][4]
1113
[![Become my sponsor][15]][16]
14+
[![Tidelift][17]][18]
1215

13-
[1]: https://travis-ci.org/imdario/mergo.png
14-
[2]: https://travis-ci.org/imdario/mergo
16+
[1]: https://github.com/imdario/mergo/workflows/tests/badge.svg?branch=master
17+
[2]: https://github.com/imdario/mergo/actions/workflows/tests.yml
1518
[3]: https://godoc.org/github.com/imdario/mergo?status.svg
1619
[4]: https://godoc.org/github.com/imdario/mergo
1720
[5]: https://img.shields.io/github/release/imdario/mergo.svg
@@ -26,6 +29,12 @@
2629
[14]: https://app.fossa.io/projects/git%2Bgithub.com%2Fimdario%2Fmergo?ref=badge_shield
2730
[15]: https://img.shields.io/github/sponsors/imdario
2831
[16]: https://github.com/sponsors/imdario
32+
[17]: https://tidelift.com/badges/package/go/github.com%2Fimdario%2Fmergo
33+
[18]: https://tidelift.com/subscription/pkg/go-github.com-imdario-mergo
34+
[19]: https://bestpractices.coreinfrastructure.org/projects/7177/badge
35+
[20]: https://bestpractices.coreinfrastructure.org/projects/7177
36+
[21]: https://api.securityscorecards.dev/projects/github.com/imdario/mergo/badge
37+
[22]: https://api.securityscorecards.dev/projects/github.com/imdario/mergo
2938

3039
A helper to merge structs and maps in Golang. Useful for configuration default values, avoiding messy if-statements.
3140

@@ -37,13 +46,19 @@ Also a lovely [comune](http://en.wikipedia.org/wiki/Mergo) (municipality) in the
3746

3847
It is ready for production use. [It is used in several projects by Docker, Google, The Linux Foundation, VMWare, Shopify, Microsoft, etc](https://github.com/imdario/mergo#mergo-in-the-wild).
3948

40-
### Important note
49+
### Important notes
50+
51+
#### 1.0.0
52+
53+
In [1.0.0](//github.com/imdario/mergo/releases/tag/1.0.0) Mergo moves to a vanity URL `dario.cat/mergo`.
54+
55+
#### 0.3.9
4156

4257
Please keep in mind that a problematic PR broke [0.3.9](//github.com/imdario/mergo/releases/tag/0.3.9). I reverted it in [0.3.10](//github.com/imdario/mergo/releases/tag/0.3.10), and I consider it stable but not bug-free. Also, this version adds support for go modules.
4358

4459
Keep in mind that in [0.3.2](//github.com/imdario/mergo/releases/tag/0.3.2), Mergo changed `Merge()`and `Map()` signatures to support [transformers](#transformers). I added an optional/variadic argument so that it won't break the existing code.
4560

46-
If you were using Mergo before April 6th, 2015, please check your project works as intended after updating your local copy with ```go get -u github.com/imdario/mergo```. I apologize for any issue caused by its previous behavior and any future bug that Mergo could cause in existing projects after the change (release 0.2.0).
61+
If you were using Mergo before April 6th, 2015, please check your project works as intended after updating your local copy with ```go get -u dario.cat/mergo```. I apologize for any issue caused by its previous behavior and any future bug that Mergo could cause in existing projects after the change (release 0.2.0).
4762

4863
### Donations
4964

@@ -55,7 +70,6 @@ If Mergo is useful to you, consider buying me a coffee, a beer, or making a mont
5570

5671
### Mergo in the wild
5772

58-
- [cli/cli](https://github.com/cli/cli)
5973
- [moby/moby](https://github.com/moby/moby)
6074
- [kubernetes/kubernetes](https://github.com/kubernetes/kubernetes)
6175
- [vmware/dispatch](https://github.com/vmware/dispatch)
@@ -102,11 +116,11 @@ If Mergo is useful to you, consider buying me a coffee, a beer, or making a mont
102116

103117
## Install
104118

105-
go get github.com/imdario/mergo
119+
go get dario.cat/mergo
106120

107121
// use in your .go code
108122
import (
109-
"github.com/imdario/mergo"
123+
"dario.cat/mergo"
110124
)
111125

112126
## Usage
@@ -144,7 +158,7 @@ package main
144158

145159
import (
146160
"fmt"
147-
"github.com/imdario/mergo"
161+
"dario.cat/mergo"
148162
)
149163

150164
type Foo struct {
@@ -180,9 +194,9 @@ package main
180194

181195
import (
182196
"fmt"
183-
"github.com/imdario/mergo"
184-
"reflect"
185-
"time"
197+
"dario.cat/mergo"
198+
"reflect"
199+
"time"
186200
)
187201

188202
type timeTransformer struct {
@@ -231,5 +245,4 @@ Written by [Dario Castañé](http://dario.im).
231245

232246
[BSD 3-Clause](http://opensource.org/licenses/BSD-3-Clause) license, as [Go language](http://golang.org/LICENSE).
233247

234-
235248
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fimdario%2Fmergo.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fimdario%2Fmergo?ref=badge_large)

vendor/dario.cat/mergo/SECURITY.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Security Policy
2+
3+
## Supported Versions
4+
5+
| Version | Supported |
6+
| ------- | ------------------ |
7+
| 0.3.x | :white_check_mark: |
8+
| < 0.3 | :x: |
9+
10+
## Security contact information
11+
12+
To report a security vulnerability, please use the
13+
[Tidelift security contact](https://tidelift.com/security).
14+
Tidelift will coordinate the fix and disclosure.

vendor/github.com/imdario/mergo/doc.go renamed to vendor/dario.cat/mergo/doc.go

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,36 @@ A helper to merge structs and maps in Golang. Useful for configuration default v
88
99
Mergo merges same-type structs and maps by setting default values in zero-value fields. Mergo won't merge unexported (private) fields. It will do recursively any exported one. It also won't merge structs inside maps (because they are not addressable using Go reflection).
1010
11-
Status
11+
# Status
1212
1313
It is ready for production use. It is used in several projects by Docker, Google, The Linux Foundation, VMWare, Shopify, etc.
1414
15-
Important note
15+
# Important notes
16+
17+
1.0.0
18+
19+
In 1.0.0 Mergo moves to a vanity URL `dario.cat/mergo`.
20+
21+
0.3.9
1622
1723
Please keep in mind that a problematic PR broke 0.3.9. We reverted it in 0.3.10. We consider 0.3.10 as stable but not bug-free. . Also, this version adds suppot for go modules.
1824
1925
Keep in mind that in 0.3.2, Mergo changed Merge() and Map() signatures to support transformers. We added an optional/variadic argument so that it won't break the existing code.
2026
21-
If you were using Mergo before April 6th, 2015, please check your project works as intended after updating your local copy with go get -u github.com/imdario/mergo. I apologize for any issue caused by its previous behavior and any future bug that Mergo could cause in existing projects after the change (release 0.2.0).
27+
If you were using Mergo before April 6th, 2015, please check your project works as intended after updating your local copy with go get -u dario.cat/mergo. I apologize for any issue caused by its previous behavior and any future bug that Mergo could cause in existing projects after the change (release 0.2.0).
2228
23-
Install
29+
# Install
2430
2531
Do your usual installation procedure:
2632
27-
go get github.com/imdario/mergo
33+
go get dario.cat/mergo
2834
29-
// use in your .go code
30-
import (
31-
"github.com/imdario/mergo"
32-
)
35+
// use in your .go code
36+
import (
37+
"dario.cat/mergo"
38+
)
3339
34-
Usage
40+
# Usage
3541
3642
You can only merge same-type structs with exported fields initialized as zero value of their type and same-types maps. Mergo won't merge unexported (private) fields but will do recursively any exported one. It won't merge empty structs value as they are zero values too. Also, maps will be merged recursively except for structs inside maps (because they are not addressable using Go reflection).
3743
@@ -59,7 +65,7 @@ Here is a nice example:
5965
6066
import (
6167
"fmt"
62-
"github.com/imdario/mergo"
68+
"dario.cat/mergo"
6369
)
6470
6571
type Foo struct {
@@ -81,17 +87,17 @@ Here is a nice example:
8187
// {two 2}
8288
}
8389
84-
Transformers
90+
# Transformers
8591
8692
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?
8793
8894
package main
8995
9096
import (
9197
"fmt"
92-
"github.com/imdario/mergo"
93-
"reflect"
94-
"time"
98+
"dario.cat/mergo"
99+
"reflect"
100+
"time"
95101
)
96102
97103
type timeTransformer struct {
@@ -127,17 +133,16 @@ Transformers allow to merge specific types differently than in the default behav
127133
// { 2018-01-12 01:15:00 +0000 UTC m=+0.000000001 }
128134
}
129135
130-
Contact me
136+
# Contact me
131137
132138
If I can help you, you have an idea or you are using Mergo in your projects, don't hesitate to drop me a line (or a pull request): https://twitter.com/im_dario
133139
134-
About
140+
# About
135141
136142
Written by Dario Castañé: https://da.rio.hn
137143
138-
License
144+
# License
139145
140146
BSD 3-Clause license, as Go language.
141-
142147
*/
143148
package mergo

0 commit comments

Comments
 (0)