diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 99ea11280..6b6cbcd52 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,10 +49,9 @@ jobs: fail-fast: false matrix: git-version: - - 2.22.0 # oldest supported version - - 2.23.0 - - 2.25.1 - - 2.30.8 + - 2.32.0 # oldest supported version + - 2.38.2 # first version that supports the rebase.updateRefs config + - 2.44.0 - latest # We rely on github to have the latest version installed on their VMs runs-on: ubuntu-latest name: "Integration Tests - git ${{matrix.git-version}}" diff --git a/pkg/app/app.go b/pkg/app/app.go index ad0d487ec..914832b83 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, 22, 0) { + if version.IsOlderThan(2, 32, 0) { return nil, minVersionError } diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 5a725a677..cc3eb4fe6 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -1709,7 +1709,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.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.", + MinGitVersionError: "Git version must be at least 2.32 (i.e. from 2021 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",