Merge branch 'master' of github.com:grails/grails-core

mfatihercik · Feb 27, 2015 · c7ebac8 · c7ebac8
2 parents 441831e + d9c2f74
commit c7ebac8
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/git/GitProfileRepository.groovy b/grails-shell/src/main/groovy/org/grails/cli/profile/git/GitProfileRepository.groovy
@@ -137,8 +137,7 @@ class GitProfileRepository implements ProfileRepository{
         if(forceUpdate || !fetchHead.exists() || fetchHead.lastModified() < System.currentTimeMillis() - updateInterval) {
             try {
                 Git git = Git.open(profilesDirectory)
-                git.fetch()
-                git.rebase()
+                git.fetch().call()
             } catch (Exception e) {
                 GrailsConsole.getInstance().error("Problem updating profiles from origin git repository", e)
             }