branch feature/GIT updated (b4cc8a4 -> 274a95e)
This is an automated email from the git hooks/post-receive script. New change to branch feature/GIT in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git from b4cc8a4 Fix the authentication problems new 274a95e Fix the problem with Git repositories which were always cloned even if there was already a local copy The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 274a95e1a0b398f7566e3fc4b49d584ca97b7181 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Thu May 7 11:36:46 2015 +0200 Fix the problem with Git repositories which were always cloned even if there was already a local copy Summary of changes: src/main/java/org/nuiton/scmwebeditor/GitConnection.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/GIT in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit 274a95e1a0b398f7566e3fc4b49d584ca97b7181 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Thu May 7 11:36:46 2015 +0200 Fix the problem with Git repositories which were always cloned even if there was already a local copy --- src/main/java/org/nuiton/scmwebeditor/GitConnection.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/nuiton/scmwebeditor/GitConnection.java b/src/main/java/org/nuiton/scmwebeditor/GitConnection.java index 56bbdad..c189447 100644 --- a/src/main/java/org/nuiton/scmwebeditor/GitConnection.java +++ b/src/main/java/org/nuiton/scmwebeditor/GitConnection.java @@ -43,6 +43,8 @@ import javax.naming.AuthenticationException; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.ArrayList; @@ -817,12 +819,10 @@ public class GitConnection implements ScmConnection { try { pull.call(); } catch (InvalidRemoteException e) { - FileUtils.deleteDirectory(localDirectory); if (log.isErrorEnabled()) { log.error("Can't pull the remote repository", e); } } catch (TransportException e) { - FileUtils.deleteDirectory(localDirectory); if (log.isErrorEnabled()) { log.error("Can't pull the remote repository: " + addressGit, e); } @@ -833,7 +833,6 @@ public class GitConnection implements ScmConnection { throw new ScmNotFoundException("Can not find a Git repository at address " + addressGit); } } catch (GitAPIException e) { - FileUtils.deleteDirectory(localDirectory); if (log.isErrorEnabled()) { log.error("Can't pull the remote repository", e); } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm