diff options
| author | Giteabot <teabot@gitea.io> | 2024-01-09 22:06:12 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-09 14:06:12 +0000 |
| commit | bce27d0a31b42a68cc3faa52dc0fb23b612b02de (patch) | |
| tree | 7ab1cde5b6ed56614ccd47f69fc38a2f841cfe77 /services/pull | |
| parent | 12f418a7e80887ec9927eea27f5770736169c17a (diff) | |
| download | gitea-bce27d0a31b42a68cc3faa52dc0fb23b612b02de.tar.gz gitea-bce27d0a31b42a68cc3faa52dc0fb23b612b02de.zip | |
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 <postmaster@gusted.xyz>
Diffstat (limited to 'services/pull')
| -rw-r--r-- | services/pull/pull.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/pull/pull.go b/services/pull/pull.go index 5e76fac815..63f39b3dca 100644 --- a/services/pull/pull.go +++ b/services/pull/pull.go @@ -4,6 +4,7 @@ package pull import ( + "bytes" "context" "fmt" "io" @@ -423,9 +424,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() { @@ -437,6 +440,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, |