mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-05-11 04:15:48 +02:00
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.
This commit is contained in:
parent
9469037cdd
commit
ad813503fb
3 changed files with 3 additions and 4 deletions
3
.github/workflows/ci.yml
vendored
3
.github/workflows/ci.yml
vendored
|
@ -49,8 +49,7 @@ jobs:
|
|||
fail-fast: false
|
||||
matrix:
|
||||
git-version:
|
||||
- 2.20.0 # oldest supported version
|
||||
- 2.22.5
|
||||
- 2.22.0 # oldest supported version
|
||||
- 2.23.0
|
||||
- 2.25.1
|
||||
- 2.30.8
|
||||
|
|
|
@ -148,7 +148,7 @@ func (app *App) validateGitVersion() (*git_commands.GitVersion, error) {
|
|||
return nil, minVersionError
|
||||
}
|
||||
|
||||
if version.IsOlderThan(2, 20, 0) {
|
||||
if version.IsOlderThan(2, 22, 0) {
|
||||
return nil, minVersionError
|
||||
}
|
||||
|
||||
|
|
|
@ -1714,7 +1714,7 @@ func EnglishTranslationSet() *TranslationSet {
|
|||
CreateNewBranchFromCommit: "Create new branch off of commit",
|
||||
BuildingPatch: "Building patch",
|
||||
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",
|
||||
SubmoduleStashAndReset: "Stash uncommitted submodule changes and update",
|
||||
AndResetSubmodules: "And reset submodules",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue