[FIXED JENKINS-14480] handle fully qualified branch names

backward compatible way
jenkinsci · Jul 23, 2012 · 2ee61e6 · 2ee61e6
1 parent 16340b1
commit 2ee61e6
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/src/main/java/hudson/plugins/git/util/DefaultBuildChooser.java b/src/main/java/hudson/plugins/git/util/DefaultBuildChooser.java
@@ -70,6 +70,8 @@ public Collection<Revision> getCandidateRevisions(boolean isPollCall, String sin
             }
         }
 
+        Collection<Revision> revisions = new ArrayList<Revision>();
+
         // if it doesn't contain '/' then it could be either a tag or an unqualified branch
         if (!singleBranch.contains("/")) {
             // the 'branch' could actually be a tag:
@@ -78,15 +80,21 @@ public Collection<Revision> getCandidateRevisions(boolean isPollCall, String sin
                 verbose(listener, "{0} is a tag");
                 return getHeadRevision(isPollCall, singleBranch, git, listener, data);
             }
-        }
 
-        Collection<Revision> revisions = new ArrayList<Revision>();
-        for (RemoteConfig config : gitSCM.getRepositories()) {
-            String repository = config.getName();
-            singleBranch = repository + "/" + singleBranch;
-            verbose(listener, "Qualifying {0} with the repository {1} a a branch", singleBranch, repository);
+            // <tt>BRANCH</tt> is recognized as a shorthand of <tt>*/BRANCH</tt>
+            // so check all remotes to fully qualify this branch spec
+            for (RemoteConfig config : gitSCM.getRepositories()) {
+                String repository = config.getName();
+                String fqbn = repository + "/" + singleBranch;
+                verbose(listener, "Qualifying {0} as a branch in repository {1} -> {2}", singleBranch, repository, fqbn);
+                revisions.addAll(getHeadRevision(isPollCall, fqbn, git, listener, data));
+            }
+        } else {
+            // singleBranch contains a '/', so is in most case a fully qualified branch
+            // doesn't seem we can distinguish unqualified branch with '/' in name, so expect users to fully qualify
             revisions.addAll(getHeadRevision(isPollCall, singleBranch, git, listener, data));
         }
+
         return revisions;
     }