Compare commits

..

No commits in common. "bce27d0a31b42a68cc3faa52dc0fb23b612b02de" and "9865aa2394a048d41d7a114dfedbfd02c950c993" have entirely different histories.

2 changed files with 1 additions and 5 deletions

View File

@ -4,7 +4,6 @@
package pull package pull
import ( import (
"bytes"
"context" "context"
"fmt" "fmt"
"io" "io"
@ -424,11 +423,9 @@ func checkIfPRContentChanged(ctx context.Context, pr *issues_model.PullRequest,
return false, fmt.Errorf("unable to open pipe for to run diff: %w", err) return false, fmt.Errorf("unable to open pipe for to run diff: %w", err)
} }
stderr := new(bytes.Buffer)
if err := cmd.Run(&git.RunOpts{ if err := cmd.Run(&git.RunOpts{
Dir: prCtx.tmpBasePath, Dir: prCtx.tmpBasePath,
Stdout: stdoutWriter, Stdout: stdoutWriter,
Stderr: stderr,
PipelineFunc: func(ctx context.Context, cancel context.CancelFunc) error { PipelineFunc: func(ctx context.Context, cancel context.CancelFunc) error {
_ = stdoutWriter.Close() _ = stdoutWriter.Close()
defer func() { defer func() {
@ -440,7 +437,6 @@ func checkIfPRContentChanged(ctx context.Context, pr *issues_model.PullRequest,
if err == util.ErrNotEmpty { if err == util.ErrNotEmpty {
return true, nil 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", log.Error("Unable to run diff on %s %s %s in tempRepo for PR[%d]%s/%s...%s/%s: Error: %v",
newCommitID, oldCommitID, base, newCommitID, oldCommitID, base,

View File

@ -94,7 +94,7 @@
{{if .Attachments}} {{if .Attachments}}
{{range .Attachments}} {{range .Attachments}}
<li> <li>
<a target="_blank" rel="nofollow" href="{{.DownloadURL}}" download> <a target="_blank" rel="nofollow" href="{{.DownloadURL}}">
<strong>{{svg "octicon-package" 16 "gt-mr-2"}}{{.Name}}</strong> <strong>{{svg "octicon-package" 16 "gt-mr-2"}}{{.Name}}</strong>
</a> </a>
<div> <div>