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

check if request branch contains revision

Browse Source
This commit is contained in:
Eduard Heimbuch
2019-10-28 11:45:42 +01:00
parent 7190259813
commit 531259bec0
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java
View File

@@ -132,7 +132,9 @@ public class GitLogCommand extends AbstractGitCommand implements LogCommand
{
converter = new GitChangesetConverter(gr, revWalk);
if (request != null && !Strings.isNullOrEmpty(request.getBranch())) {
if (request != null &&
!Strings.isNullOrEmpty(request.getBranch()) &&
revWalk.isMergedInto(commit, findTipCommitForRequestBranch(request, gr, revWalk))) {
changeset = converter.createChangeset(commit, request.getBranch());
} else {
changeset = converter.createChangeset(commit);
@@ -163,6 +165,10 @@ public class GitLogCommand extends AbstractGitCommand implements LogCommand
return changeset;
}
private RevCommit findTipCommitForRequestBranch(LogCommandRequest request, Repository gr, RevWalk revWalk) throws IOException {
return revWalk.parseCommit(GitUtil.getCommit(gr, revWalk, gr.findRef(request.getBranch())));
}
/**
* Method description
*