GitProtocolV2IT: Fix git version check for Google environment
At Google we use custom Git versions that have a version such as
"x.y.z.gXXXXXXXXXX-goog". Trying to parse the last part as number fails.
To make the Git version check pass, ignore the Google specific part of
the version.
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: Ic5185f58836fb803c825ae4cb08bb765e0531108
diff --git a/java/com/google/gerrit/acceptance/GitClientVersion.java b/java/com/google/gerrit/acceptance/GitClientVersion.java
index acfb2fa..4c9a32d 100644
--- a/java/com/google/gerrit/acceptance/GitClientVersion.java
+++ b/java/com/google/gerrit/acceptance/GitClientVersion.java
@@ -37,10 +37,11 @@
* @param version String returned by git version command
*/
public GitClientVersion(String version) {
- // "git version x.y.z"
+ // "git version x.y.z", at Google "git version x.y.z.gXXXXXXXXXX-goog"
String parts[] = version.split(" ")[2].split("\\.");
- v = new int[parts.length];
- for (int i = 0; i < parts.length; i++) {
+ int numParts = Math.min(parts.length, 3); // ignore Google-specific part of the version
+ v = new int[numParts];
+ for (int i = 0; i < numParts; i++) {
v[i] = Integer.valueOf(parts[i]);
}
}
