diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/config/DownloadInfo.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/config/DownloadInfo.java
index 35234ce435..8c9013c6d9 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/config/DownloadInfo.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/config/DownloadInfo.java
@@ -63,13 +63,8 @@ public class DownloadInfo extends JavaScriptObject {
       return command(commandName).replaceAll("\\$\\{project\\}", project);
     }
 
-    private String projectBaseName(String project) {
-      int i = project.lastIndexOf('/');
-      if (i < 0) {
-        return project;
-      } else {
-        return project.substring(i + 1);
-      }
+    private static String projectBaseName(String project) {
+      return project.substring(project.lastIndexOf('/') + 1);
     }
 
     public final Set<String> cloneCommandNames() {
diff --git a/plugins/download-commands b/plugins/download-commands
index 741c713420..a080fbb183 160000
--- a/plugins/download-commands
+++ b/plugins/download-commands
@@ -1 +1 @@
-Subproject commit 741c71342080c33c5644b2ec13dc7287f4b41f4e
+Subproject commit a080fbb183108872392e839bb783ddc0d8b94383