Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-03 03:55:51 +01:00
Code Issues Packages Projects Releases Activity

Show configured branch in case of error with competing modifications

Browse Source
This commit is contained in:
René Pfeuffer
2020-10-27 22:02:21 +01:00
parent 196ea227d2
commit c4735e7097
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitModifyCommand.java
View File

@@ -33,6 +33,7 @@ import org.eclipse.jgit.revwalk.RevCommit;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import sonia.scm.ConcurrentModificationException; import sonia.scm.ConcurrentModificationException;
import sonia.scm.ContextEntry;
import sonia.scm.NoChangesMadeException; import sonia.scm.NoChangesMadeException;
import sonia.scm.repository.GitRepositoryHandler; import sonia.scm.repository.GitRepositoryHandler;
import sonia.scm.repository.GitWorkingCopyFactory; import sonia.scm.repository.GitWorkingCopyFactory;
@@ -87,7 +88,7 @@ public class GitModifyCommand extends AbstractGitCommand implements ModifyComman
getClone().getRepository().getFullBranch(); getClone().getRepository().getFullBranch();
if (!StringUtils.isEmpty(request.getExpectedRevision()) if (!StringUtils.isEmpty(request.getExpectedRevision())
&& !request.getExpectedRevision().equals(getCurrentRevision().getName())) { && !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()) { for (ModifyCommandRequest.PartialRequest r : request.getRequests()) {
r.execute(this); r.execute(this);