Skip to content

[JENKINS-56063] (Expansion of variables in refspec in case of honor refspec on initial clone) #830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rishabhBudhouliya wants to merge 5 commits into from
Closed

[JENKINS-56063] (Expansion of variables in refspec in case of honor refspec on initial clone) #830

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2510bd3
=[JENKINS-56063] added expansion of env variables in refspec in case …
rishabhBudhouliya Jan 30, 2020
7d7f670
=removed the check flag and changed the implementation
rishabhBudhouliya Jan 31, 2020
58320c4
Changed minor indentation issues
rishabhBudhouliya Feb 1, 2020
19fa1c4
=Added testfile for CloneOption fix
rishabhBudhouliya Feb 7, 2020
145e17e
=Change in env variable
rishabhBudhouliya Feb 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion src/main/java/hudson/plugins/git/extensions/impl/CloneOption.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import hudson.plugins.git.util.GitUtils;
import hudson.slaves.NodeProperty;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import org.eclipse.jgit.transport.RefSpec;
Expand Down Expand Up @@ -148,7 +149,20 @@ public void decorateCloneCommand(GitSCM scm, Run<?, ?> build, GitClient git, Tas
// in a single job definition.
RemoteConfig rc = scm.getRepositories().get(0);
List<RefSpec> refspecs = rc.getFetchRefSpecs();
cmd.refspecs(refspecs);
List<RefSpec> expandedrefSpecs = new ArrayList<>();
Boolean check = false;
for (RefSpec ref:refspecs) {
if(ref.toString().contains("$")){
EnvVars env = build.getEnvironment(listener);
expandedrefSpecs.add(new RefSpec(env.expand(ref.toString())));
check = true;
}
}
if(!check) {
cmd.refspecs(refspecs);
} else{
cmd.refspecs(expandedrefSpecs);
}
}
cmd.timeout(timeout);

Expand Down