diff options
| author | Otto <otto@codeberg.org> | 2024-11-04 11:40:07 +0100 |
|---|---|---|
| committer | Otto <otto@codeberg.org> | 2024-11-04 11:40:07 +0100 |
| commit | 1418ac176de9f718419672af870071ce2469a071 (patch) | |
| tree | 24d314ae1961b54383358fd6d91f3124c425d597 /services/gitdiff/gitdiff.go | |
| parent | Merge pull request '[PORT] Fix a number of typescript issues (gitea#32308)' (... (diff) | |
| parent | [PORT] Fix git error handling (gitea#32401) (diff) | |
| download | forgejo-1418ac176de9f718419672af870071ce2469a071.tar.xz forgejo-1418ac176de9f718419672af870071ce2469a071.zip | |
Merge pull request '[PORT] Fix git error handling (gitea#32401)' (#5794) from gusted/forgejo-port-32401 into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5794
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: Otto <otto@codeberg.org>
Diffstat (limited to 'services/gitdiff/gitdiff.go')
| -rw-r--r-- | services/gitdiff/gitdiff.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go index 8f376a1045..91b1f135c4 100644 --- a/services/gitdiff/gitdiff.go +++ b/services/gitdiff/gitdiff.go @@ -1159,7 +1159,7 @@ func GetDiff(ctx context.Context, gitRepo *git.Repository, opts *DiffOptions, fi Dir: repoPath, Stdout: writer, Stderr: stderr, - }); err != nil { + }); err != nil && !git.IsErrCanceledOrKilled(err) { log.Error("error during GetDiff(git diff dir: %s): %v, stderr: %s", repoPath, err, stderr.String()) } |