git/api/merge.go - main - githubmirror/gitness

git/api/merge.go
142 строки4 KB
Atefeh Mohseni Ejiyeh
fix: [CODE-5591] handle non-unique merge bases gracefully instead of failing the whole import (#5235)
09 июн 2026, 20:36
09 июн 2026, 20:36822a47b
// Copyright 2023 Harness, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//     http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package api

import (
	"bytes"
	"context"
	"strings"

	"github.com/harness/gitness/errors"
	"github.com/harness/gitness/git/command"
	"github.com/harness/gitness/git/sha"
)

const (
	// RemotePrefix is the base directory of the remotes information of git.
	RemotePrefix = "refs/remotes/"
)

// GetMergeBase checks and returns merge base of two branches and the reference used as base.
func (g *Git) GetMergeBase(
	ctx context.Context,
	repoPath string,
	remote string,
	base string,
	head string,
	allowMultipleMergeBases bool,
) (sha.SHA, string, error) {
	if repoPath == "" {
		return sha.None, "", ErrRepositoryPathEmpty
	}
	if remote == "" {
		remote = "origin"
	}

	if remote != "origin" {
		tmpBaseName := RemotePrefix + remote + "/tmp_" + base
		// Fetch commit into a temporary branch in order to be able to handle commits and tags
		cmd := command.New("fetch",
			command.WithFlag("--no-tags"),
			command.WithArg(remote),
			command.WithPostSepArg(base+":"+tmpBaseName),
		)
		err := cmd.Run(ctx, command.WithDir(repoPath))
		if err == nil {
			base = tmpBaseName
		}
	}

	cmd := command.New("merge-base",
		command.WithArg(base, head),
	)

	// If the two commits (base and head) have more than one merge-base (a very rare case):
	// * If allowMultipleMergeBases=true only the first merge base would be returned.
	// * If allowMultipleMergeBases=false an invalid argument error would be returned.
	if !allowMultipleMergeBases {
		cmd = cmd.Add(command.WithFlag("--all"))
	}

	stdout, stderr := new(bytes.Buffer), new(bytes.Buffer)
	err := cmd.Run(ctx,
		command.WithDir(repoPath),
		command.WithStdout(stdout),
		command.WithStderr(stderr),
	)
	if err != nil {
		// git merge-base rev1 rev2
		// if there is unrelated history then stderr is empty with
		// exit code 1. This cannot be handled in processGitErrorf because stderr is empty.
		if command.AsError(err).IsExitCode(1) && stderr.Len() == 0 {
			return sha.None, "", &UnrelatedHistoriesError{
				BaseRef: base,
				HeadRef: head,
			}
		}

		msg := strings.TrimSpace(stderr.String())

		if strings.HasPrefix(msg, "fatal: Not a valid object name") {
			return sha.None, "", errors.NotFound(strings.TrimPrefix(msg, "fatal: "))
		}

		return sha.None, "", processGitErrorf(err, "failed to get merge-base [%s, %s]", base, head)
	}

	mergeBase := strings.TrimSpace(stdout.String())
	if count := strings.Count(mergeBase, "\n") + 1; count > 1 {
		return sha.None, "",
			errors.InvalidArgumentf("The commits %s and %s have %d merge bases. This is not supported.",
				base, head, count).SetErr(ErrMergeBaseNonUnique)
	}

	result, err := sha.New(mergeBase)
	if err != nil {
		return sha.None, "", err
	}
	return result, base, nil
}

// IsAncestor returns if the provided commit SHA is ancestor of the other commit SHA.
func (g *Git) IsAncestor(
	ctx context.Context,
	repoPath string,
	alternates []string,
	ancestorCommitSHA,
	descendantCommitSHA sha.SHA,
) (bool, error) {
	if repoPath == "" {
		return false, ErrRepositoryPathEmpty
	}

	cmd := command.New("merge-base",
		command.WithFlag("--is-ancestor"),
		command.WithArg(ancestorCommitSHA.String(), descendantCommitSHA.String()),
		command.WithAlternateObjectDirs(alternates...),
	)

	err := cmd.Run(ctx, command.WithDir(repoPath))
	if err != nil {
		cmdErr := command.AsError(err)
		if cmdErr != nil && cmdErr.IsExitCode(1) && len(cmdErr.StdErr) == 0 {
			return false, nil
		}
		return false, processGitErrorf(err, "failed to check commit ancestry [%s, %s]",
			ancestorCommitSHA, descendantCommitSHA)
	}

	return true, nil
}