From 904bfc37c68f6afa21b0665dfe8bffb26151fc56 Mon Sep 17 00:00:00 2001 From: rlynch2 Date: Thu, 3 Nov 2016 22:54:15 -0700 Subject: [PATCH] fixed bad IDE formatting --- .../server/environment/JGitEnvironmentRepository.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 57eea416..575db618 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 @@ -168,11 +168,11 @@ public class JGitEnvironmentRepository extends AbstractScmEnvironmentRepository git = createGitClient(); if (shouldPull(git)) { FetchResult fetchResult = fetch(git, label); - //checkout after fetch so we can get any new branches, tags, ect. + //checkout after fetch so we can get any new branches, tags, ect. checkout(git, label); if(isBranch(git, label)) { - //merge results from fetch - MergeResult mergeResult = merge(git, label); + //merge results from fetch + MergeResult mergeResult = merge(git, label); if (!isClean(git)) { logger.warn("The local repository is dirty. Resetting it to origin/" + label + "."); @@ -182,7 +182,7 @@ public class JGitEnvironmentRepository extends AbstractScmEnvironmentRepository } else{ - //nothing to update so just checkout + //nothing to update so just checkout checkout(git, label); } //always return what is currently HEAD as the version