--- Conflict resolution: Trivial, for `repo_attributes.go` move where the `IsErrCanceledOrKilled` needs to happen because of other changes that happened in this file. To add some words to this change: It seems to be mostly simplifying the error handling of git operations. (cherry picked from commit e524f63d58900557d7d57fc3bcd19d9facc8b8ee)
Showing the changes to services/gitdiff/gitdiff.go (1 of 11 files). Show all
Unified · Split
| @@ -1159,7 +1159,7 @@ func GetDiff(ctx context.Context, gitRepo *git.Repository, opts *DiffOptions, fi · 1158 unmodified lines | ||
| 1159 | 1159 | Dir: repoPath, |
| 1160 | 1160 | Stdout: writer, |
| 1161 | 1161 | Stderr: stderr, |
| 1162 | − }); err != nil { | |
| 1162 | + }); err != nil && !git.IsErrCanceledOrKilled(err) { | |
| 1163 | 1163 | log.Error("error during GetDiff(git diff dir: %s): %v, stderr: %s", repoPath, err, stderr.String()) |
| 1164 | 1164 | } |
| 1165 | 1165 | |