Merge branch 'Indore-10.0.x' into Indore-2017.1.x

diff --git a/git-agent/src/jetbrains/buildServer/buildTriggers/vcs/git/agent/UpdaterImpl.java b/git-agent/src/jetbrains/buildServer/buildTriggers/vcs/git/agent/UpdaterImpl.java
index 38eb17bc34b8449726945598ad75345909db467f..03402ae0e2b459b3a1cd74b19d3af3c621c090d3 100644 (file)
--- a/git-agent/src/jetbrains/buildServer/buildTriggers/vcs/git/agent/UpdaterImpl.java
+++ b/git-agent/src/jetbrains/buildServer/buildTriggers/vcs/git/agent/UpdaterImpl.java
@@ -151,7 +151,7 @@ public class UpdaterImpl implements Updater {
 
   private void initGitRepository() throws VcsException {
     if (!new File(myTargetDirectory, ".git").exists()) {
-      initDirectory();
+      initDirectory(false);
     } else {
       try {
         configureRemoteUrl(new File(myTargetDirectory, ".git"));
@@ -159,7 +159,7 @@ public class UpdaterImpl implements Updater {
         configureSparseCheckout();
       } catch (Exception e) {
         LOG.warn("Do clean checkout due to errors while configure use of local mirrors", e);
-        initDirectory();
+        initDirectory(true);
       }
     }
     removeOrphanedIdxFiles(new File(myTargetDirectory, ".git"));
@@ -733,14 +733,17 @@ public class UpdaterImpl implements Updater {
    *
    * @throws VcsException if there are problems with initializing the directory
    */
-  private void initDirectory() throws VcsException {
-    BuildDirectoryCleanerCallback c = new BuildDirectoryCleanerCallback(myLogger, LOG);
-    myDirectoryCleaner.cleanFolder(myTargetDirectory, c);
-    //noinspection ResultOfMethodCallIgnored
-    myTargetDirectory.mkdirs();
-    if (c.isHasErrors()) {
-      throw new VcsException("Unable to clean directory " + myTargetDirectory + " for VCS root " + myRoot.getName());
+  private void initDirectory(boolean removeTargetDir) throws VcsException {
+    if (removeTargetDir) {
+      BuildDirectoryCleanerCallback c = new BuildDirectoryCleanerCallback(myLogger, LOG);
+      myDirectoryCleaner.cleanFolder(myTargetDirectory, c);
+      //noinspection ResultOfMethodCallIgnored
+      if (c.isHasErrors()) {
+        throw new VcsException("Unable to clean directory " + myTargetDirectory + " for VCS root " + myRoot.getName());
+      }
     }
+
+    myTargetDirectory.mkdirs();
     myLogger.message("The .git directory is missing in '" + myTargetDirectory + "'. Running 'git init'...");
     myGitFactory.create(myTargetDirectory).init().call();
     validateUrls();