[PORT] Fix git error handling (gitea#32401)

---
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)
This commit is contained in:
wxiaoguang 2024-11-02 19:20:22 +08:00 committed by Gusted
parent 20c0a2a381
commit 171de4d107
No known key found for this signature in database
GPG key ID: FD821B732837125F
11 changed files with 36 additions and 86 deletions

View file

@ -250,7 +250,7 @@ func (repo *Repository) GitAttributeChecker(treeish string, attributes ...string
err = e
}
if err != nil { // decorate the returned error
if err != nil && !IsErrCanceledOrKilled(err) { // decorate the returned error
err = fmt.Errorf("git check-attr (stderr: %q): %w", strings.TrimSpace(stdErr.String()), err)
ac.err.Store(err)
}