Refactor git command stderr handling (#36402)

And clean up legacy fragile & incorrect logic
2026-01-19 07:10:33 +08:00
parent fafd1db19e
commit 72be55f7d3
69 changed files with 345 additions and 627 deletions
@@ -13,7 +13,7 @@ import (

 // MergeBase checks and returns merge base of two commits.
 func MergeBase(ctx context.Context, repo Repository, baseCommitID, headCommitID string) (string, error) {
-	mergeBase, err := RunCmdString(ctx, repo, gitcmd.NewCommand("merge-base").
+	mergeBase, _, err := RunCmdString(ctx, repo, gitcmd.NewCommand("merge-base").
 		AddDashesAndList(baseCommitID, headCommitID))
 	if err != nil {
 		return "", fmt.Errorf("get merge-base of %s and %s failed: %w", baseCommitID, headCommitID, err)