Only log non ErrNotExist errors in git.GetNote (#19884) (#19905)

lunny · zeripath · web-flow · commit ae91913132fe · 2022-06-07T21:39:08.000+08:00
* Fix GetNote

* Only log errors if the error is not ErrNotExist

Signed-off-by: Andrew Thornton &lt;art27@cantab.net&gt;

Co-authored-by: Andrew Thornton &lt;art27@cantab.net&gt;

Co-authored-by: Andrew Thornton &lt;art27@cantab.net&gt;
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
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,10 @@ func GetNote(ctx context.Context, repo Repository, commitID string, note Note)`
`47`	`47`	`commitID = commitID[2:]`
`48`	`48`	`}`
`49`	`49`	`if err != nil {`
`50`		`- log.Error("Unable to find git note corresponding to the commit %q. Error: %v", originalCommitID, err)`
	`50`	`+ // Err may have been updated by the SubTree we need to recheck if it's again an ErrNotExist`
	`51`	`+ if !IsErrNotExist(err) {`
	`52`	`+ log.Error("Unable to find git note corresponding to the commit %q. Error: %v", originalCommitID, err)`
	`53`	`+ }`
`51`	`54`	`return err`
`52`	`55`	`}`
`53`	`56`	`}`