diff options
| author | 6543 <6543@obermui.de> | 2019-12-09 14:11:24 +0100 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2019-12-09 21:11:24 +0800 |
| commit | 7f0d7c0a17240db5be3fc5755a751d047af5faa6 (patch) | |
| tree | 9a3d25c271604ce3d3dac551e65d1a05b1f3966d | |
| parent | c34fdf7e33de3a31247e54910e2fb6e81aef4fd8 (diff) | |
| download | gitea-7f0d7c0a17240db5be3fc5755a751d047af5faa6.tar.gz gitea-7f0d7c0a17240db5be3fc5755a751d047af5faa6.zip | |
File Edit: Author/Committer interchanged [BugFix] (#9297)
* simple fix
* fix test too
* repair more twists
use same sequence: first Author, then Commiter
| -rw-r--r-- | integrations/api_repo_file_create_test.go | 12 | ||||
| -rw-r--r-- | integrations/api_repo_file_update_test.go | 12 | ||||
| -rw-r--r-- | modules/repofiles/delete.go | 2 | ||||
| -rw-r--r-- | modules/repofiles/file.go | 2 | ||||
| -rw-r--r-- | modules/repofiles/update.go | 2 |
5 files changed, 15 insertions, 15 deletions
diff --git a/integrations/api_repo_file_create_test.go b/integrations/api_repo_file_create_test.go index eb437edf03..53042b5d0a 100644 --- a/integrations/api_repo_file_create_test.go +++ b/integrations/api_repo_file_create_test.go @@ -30,12 +30,12 @@ func getCreateFileOptions() api.CreateFileOptions { NewBranchName: "master", Message: "Making this new file new/file.txt", Author: api.Identity{ - Name: "John Doe", - Email: "johndoe@example.com", + Name: "Anne Doe", + Email: "annedoe@example.com", }, Committer: api.Identity{ - Name: "Jane Doe", - Email: "janedoe@example.com", + Name: "John Doe", + Email: "johndoe@example.com", }, }, Content: contentEncoded, @@ -77,8 +77,8 @@ func getExpectedFileResponseForCreate(commitID, treePath string) *api.FileRespon HTMLURL: setting.AppURL + "user2/repo1/commit/" + commitID, Author: &api.CommitUser{ Identity: api.Identity{ - Name: "Jane Doe", - Email: "janedoe@example.com", + Name: "Anne Doe", + Email: "annedoe@example.com", }, }, Committer: &api.CommitUser{ diff --git a/integrations/api_repo_file_update_test.go b/integrations/api_repo_file_update_test.go index 236cb8eb30..369e48d646 100644 --- a/integrations/api_repo_file_update_test.go +++ b/integrations/api_repo_file_update_test.go @@ -35,8 +35,8 @@ func getUpdateFileOptions() *api.UpdateFileOptions { Email: "johndoe@example.com", }, Committer: api.Identity{ - Name: "Jane Doe", - Email: "janedoe@example.com", + Name: "Anne Doe", + Email: "annedoe@example.com", }, }, SHA: "103ff9234cefeee5ec5361d22b49fbb04d385885", @@ -80,14 +80,14 @@ func getExpectedFileResponseForUpdate(commitID, treePath string) *api.FileRespon HTMLURL: setting.AppURL + "user2/repo1/commit/" + commitID, Author: &api.CommitUser{ Identity: api.Identity{ - Name: "Jane Doe", - Email: "janedoe@example.com", + Name: "John Doe", + Email: "johndoe@example.com", }, }, Committer: &api.CommitUser{ Identity: api.Identity{ - Name: "John Doe", - Email: "johndoe@example.com", + Name: "Anne Doe", + Email: "annedoe@example.com", }, }, Message: "My update of README.md\n", 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 0042be52cd..4d2f1d5f04 100644 --- a/modules/repofiles/update.go +++ b/modules/repofiles/update.go @@ -168,7 +168,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 { |