Only log non ErrNotExist errors in git.GetNote (go-gitea#19884)

* Fix GetNote * Only log errors if the error is not ErrNotExist Signed-off-by: Andrew Thornton <[email protected]> Co-authored-by: Andrew Thornton <[email protected]>
lunny · Jun 7, 2022 · 961cfd7 · 961cfd7
1 parent 0e77911
commit 961cfd7
Showing 1 changed file with 4 additions and 1 deletion.
diff --git 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
 		}
 	}