github.com/dolthub/dolt/go@v0.40.5-0.20240520175717-68db7794bea6/libraries/doltcore/merge/merge_base.go (about)

     1  // Copyright 2021 Dolthub, Inc.
     2  //
     3  // Licensed under the Apache License, Version 2.0 (the "License");
     4  // you may not use this file except in compliance with the License.
     5  // You may obtain a copy of the License at
     6  //
     7  //     http://www.apache.org/licenses/LICENSE-2.0
     8  //
     9  // Unless required by applicable law or agreed to in writing, software
    10  // distributed under the License is distributed on an "AS IS" BASIS,
    11  // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    12  // See the License for the specific language governing permissions and
    13  // limitations under the License.
    14  
    15  package merge
    16  
    17  import (
    18  	"context"
    19  
    20  	"github.com/dolthub/dolt/go/libraries/doltcore/doltdb"
    21  
    22  	"github.com/dolthub/dolt/go/store/hash"
    23  )
    24  
    25  func MergeBase(ctx context.Context, left, right *doltdb.Commit) (base hash.Hash, err error) {
    26  	optCmt, err := doltdb.GetCommitAncestor(ctx, left, right)
    27  	if err != nil {
    28  		return base, err
    29  	}
    30  	ancestor, ok := optCmt.ToCommit()
    31  	if !ok {
    32  		return base, doltdb.ErrGhostCommitEncountered
    33  	}
    34  
    35  	return ancestor.HashOf()
    36  }