avoid pulling before doing a change to the git repo if we have disabl…

…ed pullOnStartup
hawtio · Jul 30, 2013 · 53f2225 · 53f2225
1 parent 842abbb
commit 53f2225
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/hawtio-git/src/main/java/io/hawt/git/GitFacade.java b/hawtio-git/src/main/java/io/hawt/git/GitFacade.java
@@ -894,7 +894,7 @@ protected <T> T gitOperation(PersonIdent personIdent, Callable<T> callable) {
                     // lets stash any local changes just in case..
                     git.stashCreate().setPerson(personIdent).setWorkingDirectoryMessage("Stash before a write").setRef("HEAD").call();
                 }
-                if (isPullBeforeOperation() && Strings.isNotBlank(getRemoteRepository())) {
+                if (isPullOnStartup() && isPullBeforeOperation() && Strings.isNotBlank(getRemoteRepository())) {
                     doPull();
                 }
                 return callable.call();