domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

File Edit: Author/Committer interchanged [BugFix] (#9297)

Browse source 
* simple fix

* fix test too

* repair more twists
use same sequence: first Author, then Commiter
This commit is contained in:
6543 2019-12-09 14:11:24 +01:00 • committed by Lunny Xiao
parent c34fdf7e33
commit 7f0d7c0a17
5 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/repofiles/file.go
View file

@ -80,7 +80,7 @@ func GetFileCommitResponse(repo *models.Repository, commit *git.Commit) (*api.Fi
}
// GetAuthorAndCommitterUsers Gets the author and committer user objects from the IdentityOptions
func GetAuthorAndCommitterUsers(author, committer *IdentityOptions, doer *models.User) (committerUser, authorUser *models.User) {
func GetAuthorAndCommitterUsers(author, committer *IdentityOptions, doer *models.User) (authorUser, committerUser *models.User) {
// Committer and author are optional. If they are not the doer (not same email address)
// then we use bogus User objects for them to store their FullName and Email.
// If only one of the two are provided, we set both of them to it.