diff options
| author | Konrad Kügler <swamblumat-eclipsebugs@yahoo.de> | 2014-09-01 21:09:59 +0200 |
|---|---|---|
| committer | Robin Stocker <robin@nibor.org> | 2014-09-02 07:57:04 -0400 |
| commit | 9ac59efbbd17bcc41fa82e2ead3b2a0a73206dce (patch) | |
| tree | 47b5882e7c9819da6cdeddec6c58cc09e9fc0ca6 /org.eclipse.jgit | |
| parent | 3885ce2a9403483e1cfd1bb4d3d2a119e3cdd928 (diff) | |
| download | jgit-9ac59efbbd17bcc41fa82e2ead3b2a0a73206dce.tar.gz jgit-9ac59efbbd17bcc41fa82e2ead3b2a0a73206dce.zip | |
PlotCommitList: Close plot lanes at root commits
Bug: 443006
Change-Id: I40b1eb044fa2d9e6c5d4b956c17e32ca6c1bd39f
Signed-off-by: Konrad Kügler <swamblumat-eclipsebugs@yahoo.de>
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java index 36e4b4b3fa..3444c8df1c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java @@ -128,11 +128,8 @@ public class PlotCommitList<L extends PlotLane> extends final int nChildren = currCommit.getChildCount(); if (nChildren == 0) { currCommit.lane = nextFreeLane(); - continueActiveLanes(currCommit); - return; - } - - if (nChildren == 1 && currCommit.children[0].getParentCount() < 2) { + } else if (nChildren == 1 + && currCommit.children[0].getParentCount() < 2) { // Only one child, child has only us as their parent. // Stay in the same lane as the child. @@ -195,7 +192,10 @@ public class PlotCommitList<L extends PlotLane> extends closeLane(c.lane); } } + continueActiveLanes(currCommit); + if (currCommit.getParentCount() == 0) + closeLane(currCommit.lane); } private void continueActiveLanes(final PlotCommit currCommit) { |