From c4735e70976be2d3ddd352676d27a6c96e91a9d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 27 Oct 2020 22:02:21 +0100 Subject: [PATCH] Show configured branch in case of error with competing modifications --- .../main/java/sonia/scm/repository/spi/GitModifyCommand.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitModifyCommand.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitModifyCommand.java index 01271d0fc3..95e3af0aa9 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitModifyCommand.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitModifyCommand.java @@ -33,6 +33,7 @@ import org.eclipse.jgit.revwalk.RevCommit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import sonia.scm.ConcurrentModificationException; +import sonia.scm.ContextEntry; import sonia.scm.NoChangesMadeException; import sonia.scm.repository.GitRepositoryHandler; import sonia.scm.repository.GitWorkingCopyFactory; @@ -87,7 +88,7 @@ public class GitModifyCommand extends AbstractGitCommand implements ModifyComman getClone().getRepository().getFullBranch(); if (!StringUtils.isEmpty(request.getExpectedRevision()) && !request.getExpectedRevision().equals(getCurrentRevision().getName())) { - throw new ConcurrentModificationException("branch", request.getBranch() == null ? "default" : request.getBranch()); + throw new ConcurrentModificationException(ContextEntry.ContextBuilder.entity("Branch", request.getBranch() == null ? "default" : request.getBranch()).in(repository).build()); } for (ModifyCommandRequest.PartialRequest r : request.getRequests()) { r.execute(this);