diff options
Diffstat (limited to 'commitquery/query_merge_bases_internal.go')
| -rw-r--r-- | commitquery/query_merge_bases_internal.go | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/commitquery/query_merge_bases_internal.go b/commitquery/query_merge_bases_internal.go deleted file mode 100644 index 2d133435..00000000 --- a/commitquery/query_merge_bases_internal.go +++ /dev/null @@ -1,34 +0,0 @@ -package commitquery - -import "slices" - -// mergeBases returns internal merge-base candidates for two resolved nodes. -func (query *query) mergeBases(left, right nodeIndex) ([]nodeIndex, error) { - if left == right { - return []nodeIndex{left}, nil - } - - err := query.paintDownToCommon(left, []nodeIndex{right}, 0) - if err != nil { - return nil, err - } - - candidates := query.collectMarkedResults() - - if len(candidates) <= 1 { - slices.SortFunc(candidates, query.compare) - - return candidates, nil - } - - query.clearTouchedMarks(allMarks) - - reduced, err := removeRedundant(query, candidates) - if err != nil { - return nil, err - } - - slices.SortFunc(reduced, query.compare) - - return reduced, nil -} |
