From ad813503fb4383558f571d51a2da7c3c7126e505 Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Mon, 31 Mar 2025 15:52:45 +0200 Subject: [PATCH] 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. --- .github/workflows/ci.yml | 3 +-- pkg/app/app.go | 2 +- pkg/i18n/english.go | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a108733b3..fb3fe8f50 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/pkg/app/app.go b/pkg/app/app.go index a999a902b..8d1d1568c 100644 --- a/pkg/app/app.go +++ b/pkg/app/app.go @@ -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 } diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 473ce50e8..5aa70426d 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -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",