This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit 163f7d743eaff2ddbc64bc01f10df4ca40a4e851 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 22 11:23:47 2015 +0100 Update jgit to 4.1.1.201511131810-r (Fixes #3828) --- pom.xml | 2 +- .../src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java | 6 ++++-- swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitProvider.java | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 3598857..fced205 100644 --- a/pom.xml +++ b/pom.xml @@ -195,7 +195,7 @@ <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit</artifactId> - <version>3.7.0.201502260915-r</version> + <version>4.1.1.201511131810-r</version> </dependency> <dependency> diff --git a/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java b/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java index 60ec870..f5ca173 100644 --- a/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java +++ b/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java @@ -975,9 +975,11 @@ public class GitConnection implements ScmConnection { logMessage = "Can not push : someone else is updating the HEAD or the branch"; } else if (e instanceof WrongRepositoryStateException) { logMessage = "Can not push : the repository is not in the right state"; - } else if (e instanceof RejectCommitException) { - logMessage = "Can not push : commit rejected"; } + //TC-2015-12-22 does not exist any longer +// else if (e instanceof RejectCommitException) { +// logMessage = "Can not push : commit rejected"; +// } if (log.isErrorEnabled()) { log.error(logMessage, e); diff --git a/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitProvider.java b/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitProvider.java index 950cf29..e17ea42 100644 --- a/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitProvider.java +++ b/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitProvider.java @@ -166,9 +166,11 @@ public class GitProvider implements ScmProvider { logMessage = "Can not push : someone else is updating the HEAD or the branch"; } else if (e instanceof WrongRepositoryStateException) { logMessage = "Can not push : the repository is not in the right state"; - } else if (e instanceof RejectCommitException) { - logMessage = "Can not push : commit rejected"; } + //TC-2015-12-22 does not exist any longer +// else if (e instanceof RejectCommitException) { +// logMessage = "Can not push : commit rejected"; +// } if (log.isErrorEnabled()) { log.error(logMessage, e); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.