From 01698dd99867f9937d382a705a672f8a773c9e5d Mon Sep 17 00:00:00 2001 From: rlynch2 Date: Sat, 5 Nov 2016 15:59:42 -0700 Subject: [PATCH] Added TagOps.FETCH_TAGS to the fetch command so we get all tags. --- .../server/environment/JGitEnvironmentRepository.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java index 0cbba345..c6c3c518 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java @@ -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; @@ -167,7 +164,7 @@ public class JGitEnvironmentRepository extends AbstractScmEnvironmentRepository try { git = createGitClient(); if (shouldPull(git)) { - fetch(git, label);:wQ + fetch(git, label); //checkout after fetch so we can get any new branches, tags, ect. checkout(git, label); if(isBranch(git, label)) { @@ -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())) {