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

IDEA-79856 Lighten git version regexp to let Apple Git match it.

Browse Source
This commit is contained in:
Kirill Likhodedov
2012-02-20 13:42:19 +04:00
parent 4873c470ba
commit baab21f84d
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/config/GitVersion.java
+4 -3
View File
@@ -35,7 +35,8 @@ import java.util.regex.Pattern;
* The version of Git. Note that the version number ignores build and commit hash.
* The class is able to distinct MSYS and CYGWIN Gits under Windows assuming that msysgit adds the 'msysgit' suffix to the output
* of the 'git version' command.
* This is not a very good way to distinguish msys and cygwin since in old versions of msys they didn't add the suffix.
* This is not a very good way to distinguish msys and cygwin since in old versions of msys they didn't add the suffix.
*
* Note: this class has a natural ordering that is inconsistent with equals.
*/
public final class GitVersion implements Comparable<GitVersion> {
@@ -68,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+))?(?:\\.(msysgit))?[\\.\\-\\d\\w]*", Pattern.CASE_INSENSITIVE);
"git version (\\d+)\\.(\\d+)\\.(\\d+)(?:\\.(\\d+))?(.*)", Pattern.CASE_INSENSITIVE);
private static final Logger LOG = Logger.getInstance(GitVersion.class.getName());
@@ -112,7 +113,7 @@ public final class GitVersion implements Comparable<GitVersion> {
int minor = getIntGroup(m, 2);
int rev = getIntGroup(m, 3);
int patch = getIntGroup(m, 4);
boolean msys = (m.groupCount() >= 5) && m.group(5) != null && m.group(5).equalsIgnoreCase("msysgit");
boolean msys = (m.groupCount() >= 5) && m.group(5) != null && m.group(5).toLowerCase().contains("msysgit");
Type type;
if (SystemInfo.isWindows) {
type = msys ? Type.MSYS : Type.CYGWIN;
plugins/git4idea/tests/git4idea/tests/GitVersionTest.java
+2 -1
View File
@@ -36,7 +36,8 @@ public class GitVersionTest {
new TestGitVersion("git version 1.6.4", 1, 6, 4, 0),
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.4-rc1", 1, 7, 4, 0),
new TestGitVersion("git version 1.7.7.5 (Apple Git-24)", 1, 7, 7, 5)
};
private static final TestGitVersion[] msysTests = {