mirror of
https://github.com/go-gitea/gitea.git
synced 2026-01-28 06:50:44 +01:00
1463426a27
In Git 2.38, the `merge-tree` command introduced the `--write-tree` option, which works directly on bare repositories. In Git 2.40, a new parameter `--merge-base` introduced so we require Git 2.40 to use the merge tree feature. This option produces the merged tree object ID, allowing us to perform diffs between commits without creating a temporary repository. By avoiding the overhead of setting up and tearing down temporary repos, this approach delivers a notable performance improvement. It also fixes a possible situation that conflict files might be empty but it's a conflict status according to https://git-scm.com/docs/git-merge-tree#_mistakes_to_avoid Replace #35542 --------- Signed-off-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
33 lines
885 B
Go
33 lines
885 B
Go
// Copyright 2026 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package gitcmd
|
|
|
|
import (
|
|
"context"
|
|
)
|
|
|
|
type Context interface {
|
|
context.Context
|
|
|
|
// CancelPipeline is a helper function to cancel the command context (kill the command) with a specific error cause,
|
|
// it returns the same error for convenience to break the PipelineFunc easily
|
|
CancelPipeline(err error) error
|
|
|
|
// In the future, this interface will be extended to support stdio pipe readers/writers
|
|
}
|
|
|
|
type cmdContext struct {
|
|
context.Context
|
|
cmd *Command
|
|
}
|
|
|
|
func (c *cmdContext) CancelPipeline(err error) error {
|
|
// pipelineError is used to distinguish between:
|
|
// * context canceled by pipeline caller with/without error (normal cancellation)
|
|
// * context canceled by parent context (still context.Canceled error)
|
|
// * other causes
|
|
c.cmd.cmdCancel(pipelineError{err})
|
|
return err
|
|
}
|