default to master branch if non is given Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/a5005234 Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/a5005234 Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/a5005234
Branch: refs/heads/master Commit: a5005234229391d3846d1113feba131a09dd8ef3 Parents: 1fe2545 Author: imod <d...@fortysix.ch> Authored: Sat Jun 22 15:28:56 2013 +0200 Committer: imod <d...@fortysix.ch> Committed: Sat Jun 22 15:28:56 2013 +0200 ---------------------------------------------------------------------- .../git/jgit/command/checkout/JGitCheckOutCommand.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-scm/blob/a5005234/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommand.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommand.java b/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommand.java index 8bde16e..af2b43c 100644 --- a/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommand.java +++ b/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommand.java @@ -34,10 +34,11 @@ import org.apache.maven.scm.provider.ScmProviderRepository; import org.apache.maven.scm.provider.git.command.GitCommand; import org.apache.maven.scm.provider.git.jgit.command.JGitUtils; import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository; +import org.codehaus.plexus.util.StringUtils; import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ProgressMonitor; import org.eclipse.jgit.transport.CredentialsProvider; -import org.eclipse.jgit.transport.URIish; /** * @author <a href="mailto:strub...@yahoo.de";>Mark Struberg</a> @@ -64,6 +65,9 @@ public class JGitCheckOutCommand extends AbstractCheckOutCommand implements GitC ProgressMonitor monitor = JGitUtils.getMonitor(getLogger()); String branch = version.getName(); + if (StringUtils.isBlank(branch)) { + branch = Constants.MASTER; + } if (!fileSet.getBasedir().exists() || !(new File(fileSet.getBasedir(), ".git").exists())) { if (fileSet.getBasedir().exists()) { @@ -82,7 +86,6 @@ public class JGitCheckOutCommand extends AbstractCheckOutCommand implements GitC getLogger().info("checkout [" + branch + "] to " + fileSet.getBasedir()); git.checkout().setName(branch).call(); - URIish uri = new URIish(repository.getFetchUrl()); git.fetch().setRemote(repository.getFetchUrl()).call(); git.pull().call(); }
