From b4b4f29e42e4513be3415dd36436f66f897f6e4a Mon Sep 17 00:00:00 2001 From: Rene Pfeuffer Date: Wed, 15 Jan 2020 09:51:00 +0100 Subject: [PATCH] Log messages from failed push result --- .../java/sonia/scm/repository/spi/AbstractGitCommand.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitCommand.java index ba25d840bd..24f900dfc2 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitCommand.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitCommand.java @@ -259,12 +259,13 @@ class AbstractGitCommand void push() { try { - Iterable pushResult = clone.push().call(); - Iterator pushResultIterator = pushResult.iterator(); + Iterable pushResults = clone.push().call(); + Iterator pushResultIterator = pushResults.iterator(); if (!pushResultIterator.hasNext()) { throw new InternalRepositoryException(repository, "got no result from push"); } - Collection remoteUpdates = pushResultIterator.next().getRemoteUpdates(); + PushResult pushResult = pushResultIterator.next(); + Collection remoteUpdates = pushResult.getRemoteUpdates(); if (remoteUpdates.isEmpty()) { throw new InternalRepositoryException(repository, "push created no update"); } @@ -273,6 +274,7 @@ class AbstractGitCommand .filter(remoteRefUpdate -> remoteRefUpdate.getStatus() != RemoteRefUpdate.Status.OK) .findAny() .ifPresent(remoteRefUpdate -> { + logger.info("message for failed push: {}", pushResult.getMessages()); throw new IntegrateChangesFromWorkdirException(repository, "could not push changes into central repository: " + remoteRefUpdate.getStatus()); }); } catch (GitAPIException e) {