Merge branch 'develop' into stable
This commit is contained in:
commit
e54c93f121
@ -144,6 +144,7 @@ public class LocalRepositoryCache {
|
|||||||
if (this.logger.isDebugEnabled())
|
if (this.logger.isDebugEnabled())
|
||||||
this.logger.debug("resetting Git");
|
this.logger.debug("resetting Git");
|
||||||
git.reset().setMode(ResetType.HARD).call();
|
git.reset().setMode(ResetType.HARD).call();
|
||||||
|
git.fetch().call();
|
||||||
|
|
||||||
if (branch != null && !branch.equals(git.getRepository().getBranch())) {
|
if (branch != null && !branch.equals(git.getRepository().getBranch())) {
|
||||||
if (this.logger.isDebugEnabled())
|
if (this.logger.isDebugEnabled())
|
||||||
|
Loading…
x
Reference in New Issue
Block a user