SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/new-remote-label-fix'

Browse Source 
Added TagOpts.FETCH_ALL to the fetch
This commit is contained in:
rlynch2
2016-11-05 16:04:57 -07:00
parent 80e6074a4f 01698dd998
commit 29922e1a21
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java
View File

@@ -41,11 +41,8 @@ import org.eclipse.jgit.api.TransportCommand;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.api.errors.RefNotFoundException;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.transport.FetchResult;
import org.eclipse.jgit.transport.JschConfigSessionFactory;
import org.eclipse.jgit.transport.*;
import org.eclipse.jgit.transport.OpenSshConfig.Host;
import org.eclipse.jgit.transport.SshSessionFactory;
import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
import org.eclipse.jgit.util.FileUtils;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.env.ConfigurableEnvironment;
@@ -284,7 +281,9 @@ public class JGitEnvironmentRepository extends AbstractScmEnvironmentRepository
}
private FetchResult fetch(Git git, String label) {
FetchCommand fetch = git.fetch().setRemote("origin");
FetchCommand fetch = git.fetch()
.setRemote("origin")
.setTagOpt(TagOpt.FETCH_TAGS);
setTimeout(fetch);
try {
if (hasText(getUsername())) {