Merge pull request #187 from jenkinsci/JENKINS-14026

[FIXED JENKINS-14026] git plugin doesn't support branch name contains
jenkinsci · Jan 9, 2014 · a67bbc0 · a67bbc0 · daspilker · Jan 22, 2014
2 parents b75d1e2 + 13c2b08
commit a67bbc0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/main/java/hudson/plugins/git/GitSCM.java b/src/main/java/hudson/plugins/git/GitSCM.java
@@ -435,6 +435,10 @@ private String getSingleBranch(EnvVars env) {
         // Check for empty string - replace with "**" when seen.
         if (branch.equals("")) {
             branch = "**";
+        } else if (!branch.startsWith(repository)) {
+            // we can hit this case if the given branch name contains a slash.
+            // Since we have a single repository, it makes sense to prepend it anyway
+            branch = repository + "/" + branch;
         }
 
         return branch;

diff --git a/src/test/java/hudson/plugins/git/GitSCMTest.java b/src/test/java/hudson/plugins/git/GitSCMTest.java
@@ -494,6 +494,20 @@ public void testBranchIsAvailableInEvironment() throws Exception {
         assertEquals("origin/master", getEnvVars(project).get(GitSCM.GIT_BRANCH));
     }
 
+    public void testBranchContainsSlash() throws Exception {
+      FreeStyleProject project = setupSimpleProject("my/branch");
+
+      final String commitFile1 = "commitFile1";
+      commit(commitFile1, johnDoe, "Commit number 1");
+      git.branch("my/branch");
+      git.checkout("my/branch");
+      final String commitFile2 = "commitFile2";
+      commit(commitFile2, johnDoe, "Commit number 2");
+      build(project, Result.SUCCESS, commitFile1, commitFile2);
+
+      assertEquals("origin/my/branch", getEnvVars(project).get(GitSCM.GIT_BRANCH));
+    }
+
     // For HUDSON-7411
     public void testNodeEnvVarsAvailable() throws Exception {
         FreeStyleProject project = setupSimpleProject("master");