Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only log non ErrNotExist errors in git.GetNote #19884

Merged
merged 7 commits into from
Jun 7, 2022
Merged

Only log non ErrNotExist errors in git.GetNote #19884

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
71a18ca
Fix GetNote
lunny Jun 4, 2022
8c7498a
Only log errors if the error is not ErrNotExist
zeripath Jun 4, 2022
9e1a421
Merge branch 'main' into lunny/fix_gitnote
zeripath Jun 4, 2022
28ace91
Merge branch 'main' into lunny/fix_gitnote
zeripath Jun 4, 2022
d7cb503
Merge branch 'main' into lunny/fix_gitnote
zeripath Jun 5, 2022
933c2fd
Merge branch 'main' into lunny/fix_gitnote
lunny Jun 6, 2022
7830715
Merge branch 'main' into lunny/fix_gitnote
lunny Jun 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion modules/git/notes_nogogit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,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
}
}
Expand Down