1 files changed, 16 insertions, 10 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/MagicBranch.java b/gerrit-server/src/main/java/com/google/gerrit/server/util/MagicBranch.java
index 510deaa02e..60844eed66 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/util/MagicBranch.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/util/MagicBranch.java
@@ -46,12 +46,23 @@ public final class MagicBranch {
 
   /** Checks if the supplied ref name is a magic branch */
   public static boolean isMagicBranch(String refName) {
-    if (refName.startsWith(NEW_DRAFT_CHANGE) ||
-        refName.startsWith(NEW_PUBLISH_CHANGE) ||
-        refName.startsWith(NEW_CHANGE)) {
-      return true;
+    return refName.startsWith(NEW_DRAFT_CHANGE)
+        || refName.startsWith(NEW_PUBLISH_CHANGE)
+        || refName.startsWith(NEW_CHANGE);
+  }
+
+  /** Returns the ref name prefix for a magic branch, <code>null</code> if the branch is not magic */
+  public static String getMagicRefNamePrefix(String refName) {
+    if (refName.startsWith(NEW_DRAFT_CHANGE)) {
+      return NEW_DRAFT_CHANGE;
+    }
+    if (refName.startsWith(NEW_PUBLISH_CHANGE)) {
+      return NEW_PUBLISH_CHANGE;
     }
-    return false;
+    if (refName.startsWith(NEW_CHANGE)) {
+      return NEW_CHANGE;
+    }
+    return null;
   }
 
   /**
@@ -80,11 +91,6 @@ public final class MagicBranch {
     return Capable.OK;
   }
 
-  /** Checks if ref name matches the draft magic branch */
-  public static boolean isDraft(String refName) {
-    return refName.startsWith(MagicBranch.NEW_DRAFT_CHANGE);
-  }
-
   private static Capable checkMagicBranchRef(String branchName, Repository repo,
       Project project) {
     Map<String, Ref> blockingFors;