We should only log CheckPath errors if they are not simply due to context cancellation - and we should add a little more context to the error message. Fix #20709 Signed-off-by: Andrew Thornton <art27@cantab.net>tags/v1.18.0-rc0
@@ -191,8 +191,8 @@ func (c *CheckAttributeReader) Run() error { | |||
// CheckPath check attr for given path | |||
func (c *CheckAttributeReader) CheckPath(path string) (rs map[string]string, err error) { | |||
defer func() { | |||
if err != nil { | |||
log.Error("CheckPath returns error: %v", err) | |||
if err != nil && err != c.ctx.Err() { | |||
log.Error("Unexpected error when checking path %s in %s. Error: %v", path, c.Repo.Path, err) | |||
} | |||
}() | |||
@@ -1178,8 +1178,6 @@ func GetDiff(gitRepo *git.Repository, opts *DiffOptions, files ...string) (*Diff | |||
} else if language, has := attrs["gitlab-language"]; has && language != "unspecified" && language != "" { | |||
diffFile.Language = language | |||
} | |||
} else { | |||
log.Error("Unexpected error: %v", err) | |||
} | |||
} | |||