mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-11 04:15:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bump minimum required git version to 2.22

Browse source 
Versions older than 2.22 have issues with "git cherry-pick --continue" and
"git cherry-pick --skip" that are difficult to work around.
This commit is contained in:
Stefan Haller 2025-03-31 15:52:45 +02:00
parent 9469037cdd
commit ad813503fb
3 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/ci.yml vendored
View file

@ -49,8 +49,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
git-version: git-version:
- 2.20.0 # oldest supported version - 2.22.0 # oldest supported version
- 2.22.5
- 2.23.0 - 2.23.0
- 2.25.1 - 2.25.1
- 2.30.8 - 2.30.8

2
pkg/app/app.go
View file

@ -148,7 +148,7 @@ func (app *App) validateGitVersion() (*git_commands.GitVersion, error) {
return nil, minVersionError return nil, minVersionError
} }
if version.IsOlderThan(2, 20, 0) { if version.IsOlderThan(2, 22, 0) {
return nil, minVersionError return nil, minVersionError
} }

2
pkg/i18n/english.go
View file

@ -1714,7 +1714,7 @@ func EnglishTranslationSet() *TranslationSet {
CreateNewBranchFromCommit: "Create new branch off of commit", CreateNewBranchFromCommit: "Create new branch off of commit",
BuildingPatch: "Building patch", BuildingPatch: "Building patch",
ViewCommits: "View commits", ViewCommits: "View commits",
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.", 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.",
RunningCustomCommandStatus: "Running custom command", RunningCustomCommandStatus: "Running custom command",
SubmoduleStashAndReset: "Stash uncommitted submodule changes and update", SubmoduleStashAndReset: "Stash uncommitted submodule changes and update",
AndResetSubmodules: "And reset submodules", AndResetSubmodules: "And reset submodules",