Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[JENKINS-27351] A parametrized branchspec that resolves to empty shou…
…ld match everything
  • Loading branch information
jeanblanchard authored and MarkEWaite committed Jul 11, 2015
1 parent 9369a12 commit 3a83b2c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/main/java/hudson/plugins/git/BranchSpec.java
Expand Up @@ -113,7 +113,11 @@ public List<Branch> filterMatchingBranches(Collection<Branch> branches, EnvVars
}

private String getExpandedName(EnvVars env) {
return env.expand(name);
String expandedName = env.expand(name);
if (expandedName.length() == 0) {
return "**";
}
return expandedName;
}

private Pattern getPattern(EnvVars env) {
Expand Down
7 changes: 7 additions & 0 deletions src/test/java/hudson/plugins/git/TestBranchSpec.java
Expand Up @@ -64,6 +64,7 @@ public void testMatchEnv() {
envMap.put("mybranch", "my.branch");
envMap.put("anyLong", "**");
envMap.put("anyShort", "*");
envMap.put("anyEmpty", "");
EnvVars env = new EnvVars(envMap);

BranchSpec l = new BranchSpec("${master}");
Expand Down Expand Up @@ -105,6 +106,12 @@ public void testMatchEnv() {

assertTrue(p.matches("origin/x", env));
assertFalse(p.matches("origin/my-branch/b1", env));

BranchSpec q = new BranchSpec("${anyEmpty}");

assertTrue(q.matches("origin/my.branch/b1", env));
assertTrue(q.matches("origin/my-branch/b1", env));
assertTrue(q.matches("remote/origin/my.branch/b1", env));
}

@Test
Expand Down

0 comments on commit 3a83b2c

Please sign in to comment.