MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[git] IDEA-119887 Support one more git version output format

Browse Source 
Allow just 2 version numbers.
This commit is contained in:
Kirill Likhodedov
2014-01-28 19:51:41 +04:00
parent bd9cc7fab6
commit fd6db9f75d
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/config/GitVersion.java
+1 -1
View File
@@ -69,7 +69,7 @@ public final class GitVersion implements Comparable<GitVersion> {
public static final GitVersion NULL = new GitVersion(0, 0, 0, 0, Type.NULL);
private static final Pattern FORMAT = Pattern.compile(
"git version (\\d+)\\.(\\d+)\\.(\\d+)(?:\\.(\\d+))?(.*)", Pattern.CASE_INSENSITIVE);
"git version (\\d+)\\.(\\d+)(?:\\.(\\d+))?(?:\\.(\\d+))?(.*)", Pattern.CASE_INSENSITIVE);
private static final Logger LOG = Logger.getInstance(GitVersion.class.getName());
plugins/git4idea/tests/git4idea/tests/GitVersionTest.java
+2 -1
View File
@@ -34,7 +34,8 @@ public class GitVersionTest {
new TestGitVersion("git version 1.7.3.3", 1, 7, 3, 3),
new TestGitVersion("git version 1.7.3.5.gb27be", 1, 7, 3, 5),
new TestGitVersion("git version 1.7.4-rc1", 1, 7, 4, 0),
new TestGitVersion("git version 1.7.7.5 (Apple Git-24)", 1, 7, 7, 5)
new TestGitVersion("git version 1.7.7.5 (Apple Git-24)", 1, 7, 7, 5),
new TestGitVersion("git version 1.9.rc0.143.g6fd479e", 1, 9, 0, 0)
};
private static final TestGitVersion[] msysTests = {