From 73e3f64b6e50e9fa73e3d0f5387e9b159ec68869 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 17 Jul 2014 11:35:21 +0100 Subject: [PATCH] Do a pull to refresh remote config --- .../platform/config/server/JGitEnvironmentRepository.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spring-platform-config-server/src/main/java/org/springframework/platform/config/server/JGitEnvironmentRepository.java b/spring-platform-config-server/src/main/java/org/springframework/platform/config/server/JGitEnvironmentRepository.java index c250b050..5ecbe5fd 100644 --- a/spring-platform-config-server/src/main/java/org/springframework/platform/config/server/JGitEnvironmentRepository.java +++ b/spring-platform-config-server/src/main/java/org/springframework/platform/config/server/JGitEnvironmentRepository.java @@ -103,6 +103,9 @@ public class JGitEnvironmentRepository implements EnvironmentRepository { synchronized (this) { SpringApplicationEnvironmentRepository environment = new SpringApplicationEnvironmentRepository(); git.checkout().setName(label).call(); + if (git.status().call().isClean()) { + git.pull().call(); + } String search = git.getRepository().getDirectory().getParent(); environment.setSearchLocations(search); result = clean(environment.findOne(application, name, label));