Skip to content

Commit 3916549

Browse files
authored
Bump go-git, and get rid of github.com/imdario/mergo (#4460)
- **PR Description** This updates our go-git fork to the newest version (based on 5.14.1), and then updates the mergo dependency to use dario.cat/mergo instead of github.com/imdario/mergo.
2 parents da0105c + b78aa54 commit 3916549

File tree

528 files changed

+69418
-10232
lines changed

Some content is hidden

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

528 files changed

+69418
-10232
lines changed

Diff for: go.mod

+23-16
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,10 +12,9 @@ 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
17-
github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d
17+
github.com/jesseduffield/go-git/v5 v5.14.1-0.20250407170251-e1a013310ccd
1818
github.com/jesseduffield/gocui v0.3.1-0.20250408140206-7f1bb9232647
1919
github.com/jesseduffield/kill v0.0.0-20250101124109-e216ddbe133a
2020
github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5
@@ -30,51 +30,58 @@ require (
3030
github.com/samber/lo v1.31.0
3131
github.com/sanity-io/litter v1.5.2
3232
github.com/sasha-s/go-deadlock v0.3.5
33-
github.com/sirupsen/logrus v1.4.2
33+
github.com/sirupsen/logrus v1.9.3
3434
github.com/spf13/afero v1.9.5
3535
github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad
3636
github.com/stefanhaller/git-todo-parser v0.0.7-0.20240406123903-fd957137b6e2
37-
github.com/stretchr/testify v1.8.1
37+
github.com/stretchr/testify v1.10.0
3838
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778
39-
golang.org/x/exp v0.0.0-20220318154914-8dddf5d87bd8
39+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
4040
golang.org/x/sync v0.13.0
4141
gopkg.in/ozeidan/fuzzy-patricia.v3 v3.0.0
4242
gopkg.in/yaml.v3 v3.0.1
4343
)
4444

4545
require (
46+
github.com/Microsoft/go-winio v0.6.2 // indirect
47+
github.com/ProtonMail/go-crypto v1.1.6 // indirect
4648
github.com/bahlo/generic-list-go v0.2.0 // indirect
4749
github.com/buger/jsonparser v1.1.1 // indirect
50+
github.com/cloudflare/circl v1.6.0 // indirect
51+
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
4852
github.com/davecgh/go-spew v1.1.1 // indirect
49-
github.com/emirpasic/gods v1.12.0 // indirect
53+
github.com/emirpasic/gods v1.18.1 // indirect
5054
github.com/fatih/color v1.9.0 // indirect
5155
github.com/gdamore/encoding v1.0.1 // indirect
52-
github.com/go-git/gcfg v1.5.0 // indirect
53-
github.com/go-git/go-billy/v5 v5.0.0 // indirect
56+
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
57+
github.com/go-git/go-billy/v5 v5.6.2 // indirect
5458
github.com/go-logfmt/logfmt v0.5.0 // indirect
5559
github.com/gobwas/glob v0.2.3 // indirect
60+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
61+
github.com/hpcloud/tail v1.0.0 // indirect
5662
github.com/invopop/jsonschema v0.10.0 // indirect
5763
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
58-
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
59-
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
64+
github.com/kevinburke/ssh_config v1.2.0 // indirect
6065
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 // indirect
6166
github.com/kylelemons/godebug v1.1.0 // indirect
6267
github.com/mailru/easyjson v0.7.7 // indirect
6368
github.com/mattn/go-colorable v0.1.11 // indirect
6469
github.com/mattn/go-isatty v0.0.14 // indirect
65-
github.com/mitchellh/go-homedir v1.1.0 // indirect
6670
github.com/onsi/ginkgo v1.10.3 // indirect
67-
github.com/onsi/gomega v1.7.1 // indirect
6871
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect
72+
github.com/pjbgf/sha1cd v0.3.2 // indirect
6973
github.com/pmezard/go-difflib v1.0.0 // indirect
7074
github.com/rivo/uniseg v0.4.7 // indirect
71-
github.com/sergi/go-diff v1.1.0 // indirect
75+
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
76+
github.com/skeema/knownhosts v1.3.1 // indirect
7277
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
73-
github.com/xanzy/ssh-agent v0.2.1 // indirect
74-
golang.org/x/crypto v0.31.0 // indirect
75-
golang.org/x/net v0.33.0 // indirect
78+
github.com/xanzy/ssh-agent v0.3.3 // indirect
79+
golang.org/x/crypto v0.37.0 // indirect
80+
golang.org/x/net v0.39.0 // indirect
7681
golang.org/x/sys v0.32.0 // indirect
7782
golang.org/x/term v0.31.0 // indirect
7883
golang.org/x/text v0.24.0 // indirect
84+
gopkg.in/fsnotify.v1 v1.4.7 // indirect
85+
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
7986
gopkg.in/warnings.v0 v0.1.2 // indirect
8087
)

Diff for: go.sum

+64-67
Large diffs are not rendered by default.

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 renamed to vendor/dario.cat/mergo/.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
# Output of the go coverage tool, specifically when used with LiteIDE
1414
*.out
1515

16+
# Golang/Intellij
17+
.idea
18+
1619
# Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
1720
.glide/
1821

Diff for: vendor/dario.cat/mergo/CONTRIBUTING.md

+112
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)!
File renamed without changes.

0 commit comments

Comments
 (0)