Skip to content

Commit ad81350

Browse files
committed
Bump minimum required git version to 2.22
Versions older than 2.22 have issues with "git cherry-pick --continue" and "git cherry-pick --skip" that are difficult to work around.
1 parent 9469037 commit ad81350

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ jobs:
4949
fail-fast: false
5050
matrix:
5151
git-version:
52-
- 2.20.0 # oldest supported version
53-
- 2.22.5
52+
- 2.22.0 # oldest supported version
5453
- 2.23.0
5554
- 2.25.1
5655
- 2.30.8

pkg/app/app.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ func (app *App) validateGitVersion() (*git_commands.GitVersion, error) {
148148
return nil, minVersionError
149149
}
150150

151-
if version.IsOlderThan(2, 20, 0) {
151+
if version.IsOlderThan(2, 22, 0) {
152152
return nil, minVersionError
153153
}
154154

pkg/i18n/english.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1714,7 +1714,7 @@ func EnglishTranslationSet() *TranslationSet {
17141714
CreateNewBranchFromCommit: "Create new branch off of commit",
17151715
BuildingPatch: "Building patch",
17161716
ViewCommits: "View commits",
1717-
MinGitVersionError: "Git version must be at least 2.20 (i.e. from 2018 onwards). Please upgrade your git version. Alternatively raise an issue at https://github.com/jesseduffield/lazygit/issues for lazygit to be more backwards compatible.",
1717+
MinGitVersionError: "Git version must be at least 2.22 (i.e. from 2019 onwards). Please upgrade your git version. Alternatively raise an issue at https://github.com/jesseduffield/lazygit/issues for lazygit to be more backwards compatible.",
17181718
RunningCustomCommandStatus: "Running custom command",
17191719
SubmoduleStashAndReset: "Stash uncommitted submodule changes and update",
17201720
AndResetSubmodules: "And reset submodules",

0 commit comments

Comments
 (0)