From ae91913132fe2cf0db03b9d3012b7f663375ee5b Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Tue, 7 Jun 2022 21:39:08 +0800
Subject: [PATCH] Only log non ErrNotExist errors in git.GetNote (#19884)
(#19905)
* Fix GetNote
* Only log errors if the error is not ErrNotExist
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: Andrew Thornton <art27@cantab.net>
---
modules/git/notes_nogogit.go | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/modules/git/notes_nogogit.go b/modules/git/notes_nogogit.go
index bbc8ee1371..4e44167c3d 100644
--- a/modules/git/notes_nogogit.go
+++ b/modules/git/notes_nogogit.go
@@ -47,7 +47,10 @@ func GetNote(ctx context.Context, repo *Repository, commitID string, note *Note)
commitID = commitID[2:]
}
if err != nil {
- log.Error("Unable to find git note corresponding to the commit %q. Error: %v", originalCommitID, err)
+ // Err may have been updated by the SubTree we need to recheck if it's again an ErrNotExist
+ if !IsErrNotExist(err) {
+ log.Error("Unable to find git note corresponding to the commit %q. Error: %v", originalCommitID, err)
+ }
return err
}
}