diff options
| -rw-r--r-- | models/gpg_key.go | 2 | ||||
| -rw-r--r-- | modules/git/commit_info.go | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/models/gpg_key.go b/models/gpg_key.go index 9b690475bd..58eaa61e22 100644 --- a/models/gpg_key.go +++ b/models/gpg_key.go @@ -682,6 +682,8 @@ 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 == nil { + log.Warn("Unable to get defaultGPGSettings for unattached commit: %s", c.ID.String()) } else if defaultGPGSettings.Sign { if commitVerification := verifyWithGPGSettings(defaultGPGSettings, sig, c.Signature.Payload, committer, keyID); commitVerification != nil { if commitVerification.Reason == BadSignature { diff --git a/modules/git/commit_info.go b/modules/git/commit_info.go index d8bf88a47c..e74ddbfb05 100644 --- a/modules/git/commit_info.go +++ b/modules/git/commit_info.go @@ -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 } |