Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-03-04 03:10:50 +01:00
Code Issues Packages Projects Releases Activity

added message to NoCommonHistoryException

Browse Source
This commit is contained in:
Sebastian Sdorra
2019-10-02 07:43:17 +02:00
parent 34177be6f7
commit a632350d32
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scm-core/src/main/java/sonia/scm/repository/NoCommonHistoryException.java
View File

@@ -8,7 +8,11 @@ import static java.util.Collections.emptyList;
public class NoCommonHistoryException extends BadRequestException {
public NoCommonHistoryException() {
super(emptyList(), "no common history");
this("no common history");
}
public NoCommonHistoryException(String message) {
super(emptyList(), message);
}
@Override

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

@@ -735,7 +735,8 @@ public final class GitUtil
mergeBaseWalk.markStart(mergeBaseWalk.parseCommit(revision2));
RevCommit ancestor = mergeBaseWalk.next();
if (ancestor == null) {
throw new NoCommonHistoryException();
String msg = "revisions %s and %s are not related and therefore do not have a common ancestor";
throw new NoCommonHistoryException(String.format(msg, revision1.name(), revision2.name()));
}
return ancestor.getId();
}