cleanup

alaingilbert · Mar 29, 2024 · 16c5047 · 16c5047
1 parent ae441d4
commit 16c5047
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/git2graph/git2graph.go b/git2graph/git2graph.go
@@ -493,16 +493,18 @@ func setColumns(colorsMan *colorsManager, nodes []*internalNode) {
  nbNodesMergingBack++
  }
  nbNodesMergingBack += nodeForMerge.nbNodesMergingBack(targetColumn)
+ followingNodeColumn := followingNode.Column
  shouldMoveNode := followingNode.Column > secondToLastPoint.X && !processedNodes[followingNode]
  if shouldMoveNode {
- followingNode.Column -= nbNodesMergingBack
+ followingNodeColumn -= nbNodesMergingBack
  }
  pathPointX := pathToFollowingNode.last().X
  pathToFollowingNode.noDupAppend(&Point{pathPointX, nodeForMerge.Idx, MergeBack})
  pathToFollowingNode.noDupAppend(&Point{pathPointX - nbNodesMergingBack, nodeForMerge.Idx, Pipe})
- pathToFollowingNode.noDupAppend(&Point{followingNode.Column, followingNode.Idx, Pipe})
+ pathToFollowingNode.noDupAppend(&Point{followingNodeColumn, followingNode.Idx, Pipe})
  if shouldMoveNode {
  // If we move the node, we need to ensure that all paths going to that node now goes to the new column
+ followingNode.Column -= nbNodesMergingBack
  fixPathsToNode(followingNode)
  processedNodes[followingNode] = true
  }