浏览代码

Fix the incomplete merge bug

Signed-off-by: Vadim Markovtsev <vadim@sourced.tech>
Vadim Markovtsev 6 年之前
父节点
当前提交
fe78687a1b
共有 2 个文件被更改,包括 3 次插入5 次删除
  1. 1 1
      internal/rbtree/rbtree.go
  2. 2 4
      leaves/burndown.go

+ 1 - 1
internal/rbtree/rbtree.go

@@ -335,7 +335,7 @@ func (tree RBTree) CloneDeep(allocator *Allocator) *RBTree {
 		count:     tree.count,
 		count:     tree.count,
 		allocator: allocator,
 		allocator: allocator,
 	}
 	}
-	nodeMap := map[uint32]uint32{0: 0}
+	nodeMap := map[uint32]uint32{}
 	originStorage := tree.storage()
 	originStorage := tree.storage()
 	for iter := tree.Min(); !iter.Limit(); iter = iter.Next() {
 	for iter := tree.Min(); !iter.Limit(); iter = iter.Next() {
 		newNode := allocator.malloc()
 		newNode := allocator.malloc()

+ 2 - 4
leaves/burndown.go

@@ -425,9 +425,7 @@ func (analyser *BurndownAnalysis) Merge(branches []core.PipelineItem) {
 			// it could be also removed in the merge commit itself
 			// it could be also removed in the merge commit itself
 			continue
 			continue
 		}
 		}
-		if len(files) > 1 {
-			files[0].Merge(analyser.packPersonWithDay(analyser.mergedAuthor, analyser.day), files[1:]...)
-		}
+		files[0].Merge(analyser.packPersonWithDay(analyser.mergedAuthor, analyser.day), files[1:]...)
 		for _, burn := range all {
 		for _, burn := range all {
 			if burn.files[key] != files[0] {
 			if burn.files[key] != files[0] {
 				if burn.files[key] != nil {
 				if burn.files[key] != nil {
@@ -1123,7 +1121,7 @@ func (analyser *BurndownAnalysis) handleInsertion(
 	name := change.To.Name
 	name := change.To.Name
 	file, exists := analyser.files[name]
 	file, exists := analyser.files[name]
 	if exists {
 	if exists {
-		println("\n", analyser, "error")
+		log.Println("\n", analyser, "error")
 		return fmt.Errorf("file %s already exists", name)
 		return fmt.Errorf("file %s already exists", name)
 	}
 	}
 	var hash plumbing.Hash
 	var hash plumbing.Hash