From c972718802218c992964c25eb473e9b7a53b17c0 Mon Sep 17 00:00:00 2001 From: Martin Buchholz Date: Sun, 17 Jan 2021 01:56:14 +0000 Subject: [PATCH] 867: Your git version is: 2.30.0.284...., which is not a known ... Reviewed-by: jvernee --- vcs/src/main/java/org/openjdk/skara/vcs/git/GitVersion.java | 2 +- .../test/java/org/openjdk/skara/vcs/git/GitVersionTest.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/vcs/src/main/java/org/openjdk/skara/vcs/git/GitVersion.java b/vcs/src/main/java/org/openjdk/skara/vcs/git/GitVersion.java index 654ca06b6..adc171004 100644 --- a/vcs/src/main/java/org/openjdk/skara/vcs/git/GitVersion.java +++ b/vcs/src/main/java/org/openjdk/skara/vcs/git/GitVersion.java @@ -32,7 +32,7 @@ public class GitVersion { private static final Pattern versionPattern = Pattern.compile( - "git version (?.*(?\\d+)\\.(?\\d+)\\.(?\\d+).*)"); + "git version (?.*?(?\\d+)\\.(?\\d+)\\.(?\\d+).*)"); private static final GitVersion UNKNOWN = new GitVersion("UNKNOWN", -1, -1, -1); private final String versionString; diff --git a/vcs/src/test/java/org/openjdk/skara/vcs/git/GitVersionTest.java b/vcs/src/test/java/org/openjdk/skara/vcs/git/GitVersionTest.java index 8d9f7a581..d3e094173 100644 --- a/vcs/src/test/java/org/openjdk/skara/vcs/git/GitVersionTest.java +++ b/vcs/src/test/java/org/openjdk/skara/vcs/git/GitVersionTest.java @@ -43,6 +43,9 @@ static Stream supportedVersions() { arguments("git version 2.25.3", 2, 25, 3), arguments("git version 2.26.1", 2, 26, 1), + arguments("git version 2.30.0.284", 2, 30, 0), + arguments("git version 2.30.0.284.cafebabe-yoyodyne", 2, 30, 0), + arguments("git version 2.27.0.windows.1", 2, 27, 0) ); } @@ -62,6 +65,9 @@ void testSupportedVersions(String versionsString, int major, int minor, int secu static Stream unsupportedVersions() { return Stream.of( + // check for "git 10 bug" + arguments("git version 10.1.12", 10, 1, 12), + arguments("git version 2.17.4", 2, 17, 4), arguments("git version 2.18.3", 2, 18, 3), arguments("git version 2.19.4", 2, 19, 4),