Skip to content

Commit e27422f

Browse files
committed
Bump minimum required git version to 2.32
The version choice is a little arbitrary, but see discussion at #4559 (comment). The main reason why I'm updating the version now is that versions before 2.27 had a bug with branch sorting, where sorting by -committerdate (which will be our default soon) would sort branches that point at the same commit in reverse alphabetical order rather than alphabetical order. While this is only slightly annoying but not a huge deal for users, it makes maintaining our integration tests across versions very hard. So I wanted to update to at least 2.27 to get around this problem, and went with 2.32 after the discussion linked to above. The choice of which versions to run integration tests on is pretty arbitrary too, I just picked some at random which are about 5 to 6 minor versions apart.
1 parent a1a2925 commit e27422f

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,9 @@ jobs:
4949
fail-fast: false
5050
matrix:
5151
git-version:
52-
- 2.22.0 # oldest supported version
53-
- 2.23.0
54-
- 2.25.1
55-
- 2.30.8
52+
- 2.32.0 # oldest supported version
53+
- 2.38.2 # first version that supports the rebase.updateRefs config
54+
- 2.44.0
5655
- latest # We rely on github to have the latest version installed on their VMs
5756
runs-on: ubuntu-latest
5857
name: "Integration Tests - git ${{matrix.git-version}}"

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, 22, 0) {
151+
if version.IsOlderThan(2, 32, 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
@@ -1709,7 +1709,7 @@ func EnglishTranslationSet() *TranslationSet {
17091709
CreateNewBranchFromCommit: "Create new branch off of commit",
17101710
BuildingPatch: "Building patch",
17111711
ViewCommits: "View commits",
1712-
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.",
1712+
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.",
17131713
RunningCustomCommandStatus: "Running custom command",
17141714
SubmoduleStashAndReset: "Stash uncommitted submodule changes and update",
17151715
AndResetSubmodules: "And reset submodules",

0 commit comments

Comments
 (0)