diff options
| author | 6543 <6543@obermui.de> | 2019-12-09 14:12:36 +0100 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2019-12-09 21:12:36 +0800 |
| commit | f11df80058275a9b1ec83dc4a1b96df8d6d7d86e (patch) | |
| tree | fb8ba808974e3b9cc812d5b90ab262b10942b45e /modules | |
| parent | 59913f405c04e83166147a3e9f94997ba35bd4b5 (diff) | |
| download | gitea-f11df80058275a9b1ec83dc4a1b96df8d6d7d86e.tar.gz gitea-f11df80058275a9b1ec83dc4a1b96df8d6d7d86e.zip | |
File Edit: Author/Committer interchanged [BugFix] (#9300)
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/repofiles/delete.go | 2 | ||||
| -rw-r--r-- | modules/repofiles/file.go | 2 | ||||
| -rw-r--r-- | modules/repofiles/update.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/modules/repofiles/delete.go b/modules/repofiles/delete.go index 2210faae6b..95b0804025 100644 --- a/modules/repofiles/delete.go +++ b/modules/repofiles/delete.go @@ -69,7 +69,7 @@ func DeleteRepoFile(repo *models.Repository, doer *models.User, opts *DeleteRepo message := strings.TrimSpace(opts.Message) - author, committer := GetAuthorAndCommitterUsers(opts.Committer, opts.Author, doer) + author, committer := GetAuthorAndCommitterUsers(opts.Author, opts.Committer, doer) t, err := NewTemporaryUploadRepository(repo) if err != nil { diff --git a/modules/repofiles/file.go b/modules/repofiles/file.go index 801f770e02..abd14b1db8 100644 --- a/modules/repofiles/file.go +++ b/modules/repofiles/file.go @@ -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. diff --git a/modules/repofiles/update.go b/modules/repofiles/update.go index 19dcc87e29..590eac92b6 100644 --- a/modules/repofiles/update.go +++ b/modules/repofiles/update.go @@ -167,7 +167,7 @@ func CreateOrUpdateRepoFile(repo *models.Repository, doer *models.User, opts *Up message := strings.TrimSpace(opts.Message) - author, committer := GetAuthorAndCommitterUsers(opts.Committer, opts.Author, doer) + author, committer := GetAuthorAndCommitterUsers(opts.Author, opts.Committer, doer) t, err := NewTemporaryUploadRepository(repo) if err != nil { |