From efa0feb734ca1d72d9611ee4b648424e355f254f Mon Sep 17 00:00:00 2001 From: Giteabot Date: Tue, 9 Jan 2024 22:06:12 +0800 Subject: [PATCH] Concatenate error in `checkIfPRContentChanged` (#28731) (#28737) Backport #28731 by @earl-warren - If there's a error with the Git command in `checkIfPRContentChanged` the stderr wasn't concatendated to the error, which results in still not knowing why an error happend. - Adds concatenation for stderr to the returned error. - Ref: https://codeberg.org/forgejo/forgejo/issues/2077 Co-authored-by: Earl Warren <109468362+earl-warren@users.noreply.github.com> Co-authored-by: Gusted (cherry picked from commit bce27d0a31b42a68cc3faa52dc0fb23b612b02de) --- services/pull/pull.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/pull/pull.go b/services/pull/pull.go index 169b6799ad..ea2310ca91 100644 --- a/services/pull/pull.go +++ b/services/pull/pull.go @@ -4,6 +4,7 @@ package pull import ( + "bytes" "context" "fmt" "io" @@ -428,9 +429,11 @@ func checkIfPRContentChanged(ctx context.Context, pr *issues_model.PullRequest, return false, fmt.Errorf("unable to open pipe for to run diff: %w", err) } + stderr := new(bytes.Buffer) if err := cmd.Run(&git.RunOpts{ Dir: prCtx.tmpBasePath, Stdout: stdoutWriter, + Stderr: stderr, PipelineFunc: func(ctx context.Context, cancel context.CancelFunc) error { _ = stdoutWriter.Close() defer func() { @@ -442,6 +445,7 @@ func checkIfPRContentChanged(ctx context.Context, pr *issues_model.PullRequest, if err == util.ErrNotEmpty { return true, nil } + err = git.ConcatenateError(err, stderr.String()) log.Error("Unable to run diff on %s %s %s in tempRepo for PR[%d]%s/%s...%s/%s: Error: %v", newCommitID, oldCommitID, base,