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

Jump to bottom

Ensure default gpg settings not nil and found commits have reference to repo #8604

Merged
merged 3 commits into from
Oct 20, 2019
Merged

Ensure default gpg settings not nil and found commits have reference to repo #8604

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9cb358
Ensure defaultGPGSettings not nil
zeripath Oct 20, 2019
9f2e8e6
Ensure that coerced commits gain a reference to the repo
zeripath Oct 20, 2019
068d6f1
Add warning if trying to get defaultgpgsetting on an unattached commit
zeripath Oct 20, 2019
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
2 changes: 1 addition & 1 deletion models/gpg_key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ func ParseCommitWithSignature(c *git.Commit) *CommitVerification {
defaultGPGSettings, err := c.GetRepositoryDefaultPublicGPGKey(false)
if err != nil {
log.Error("Error getting default public gpg key: %v", err)
} else if defaultGPGSettings.Sign {
} else if defaultGPGSettings != nil && defaultGPGSettings.Sign {
zeripath marked this conversation as resolved.
Show resolved Hide resolved
if commitVerification := verifyWithGPGSettings(defaultGPGSettings, sig, c.Signature.Payload, committer, keyID); commitVerification != nil {
if commitVerification.Reason == BadSignature {
defaultReason = BadSignature
Expand Down
1 change: 1 addition & 0 deletions modules/git/commit_info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ func (tes Entries) GetCommitsInfo(commit *Commit, treePath string, cache LastCom
treeCommit = commit
} else if rev, ok := revs[""]; ok {
treeCommit = convertCommit(rev)
treeCommit.repo = commit.repo
}
return commitsInfo, treeCommit, nil
}
Expand Down