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

fixed bad IDE formatting

Browse Source
This commit is contained in:
rlynch2
2016-11-03 22:54:15 -07:00
parent e88f12b574
commit 904bfc37c6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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