Refactor git command context & pipeline (#36406)

Less and simpler code, fewer bugs
2026-01-21 09:35:14 +08:00
parent f6db180a80
commit 9ea91e036f
36 changed files with 286 additions and 434 deletions
@@ -421,12 +421,7 @@ func checkConflicts(ctx context.Context, pr *issues_model.PullRequest, gitRepo *
 	err = cmdApply.
 		WithDir(tmpBasePath).
 		WithStderrReader(&stderrReader).
-		WithPipelineFunc(func(ctx context.Context, cancel context.CancelFunc) error {
-			defer func() {
-				// Close the reader on return to terminate the git command if necessary
-				_ = stderrReader.Close()
-			}()
-
+		WithPipelineFunc(func(ctx gitcmd.Context) error {
 			const prefix = "error: patch failed:"
 			const errorPrefix = "error: "
 			const threewayFailed = "Failed to perform three-way merge..."