finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki 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
Show stats Download patch file Download diff file Expand all files Collapse all files

12
integrations/api_repo_file_create_test.go
View file

@ -30,12 +30,12 @@ func getCreateFileOptions() api.CreateFileOptions {
NewBranchName: "master", NewBranchName: "master",
Message: "Making this new file new/file.txt", Message: "Making this new file new/file.txt",
Author: api.Identity{ Author: api.Identity{
Name: "John Doe", Name: "Anne Doe",
Email: "johndoe@example.com", Email: "annedoe@example.com",
}, },
Committer: api.Identity{ Committer: api.Identity{
Name: "Jane Doe", Name: "John Doe",
Email: "janedoe@example.com", Email: "johndoe@example.com",
}, },
}, },
Content: contentEncoded, Content: contentEncoded,
@ -77,8 +77,8 @@ func getExpectedFileResponseForCreate(commitID, treePath string) *api.FileRespon
HTMLURL: setting.AppURL + "user2/repo1/commit/" + commitID, HTMLURL: setting.AppURL + "user2/repo1/commit/" + commitID,
Author: &api.CommitUser{ Author: &api.CommitUser{
Identity: api.Identity{ Identity: api.Identity{
Name: "Jane Doe", Name: "Anne Doe",
Email: "janedoe@example.com", Email: "annedoe@example.com",
}, },
}, },
Committer: &api.CommitUser{ Committer: &api.CommitUser{

12
integrations/api_repo_file_update_test.go
View file

@ -35,8 +35,8 @@ func getUpdateFileOptions() *api.UpdateFileOptions {
Email: "johndoe@example.com", Email: "johndoe@example.com",
}, },
Committer: api.Identity{ Committer: api.Identity{
Name: "Jane Doe", Name: "Anne Doe",
Email: "janedoe@example.com", Email: "annedoe@example.com",
}, },
}, },
SHA: "103ff9234cefeee5ec5361d22b49fbb04d385885", SHA: "103ff9234cefeee5ec5361d22b49fbb04d385885",
@ -80,14 +80,14 @@ func getExpectedFileResponseForUpdate(commitID, treePath string) *api.FileRespon
HTMLURL: setting.AppURL + "user2/repo1/commit/" + commitID, HTMLURL: setting.AppURL + "user2/repo1/commit/" + commitID,
Author: &api.CommitUser{ Author: &api.CommitUser{
Identity: api.Identity{ Identity: api.Identity{
Name: "Jane Doe", Name: "John Doe",
Email: "janedoe@example.com", Email: "johndoe@example.com",
}, },
}, },
Committer: &api.CommitUser{ Committer: &api.CommitUser{
Identity: api.Identity{ Identity: api.Identity{
Name: "John Doe", Name: "Anne Doe",
Email: "johndoe@example.com", Email: "annedoe@example.com",
}, },
}, },
Message: "My update of README.md\n", Message: "My update of README.md\n",

2
modules/repofiles/delete.go
View file

@ -69,7 +69,7 @@ func DeleteRepoFile(repo *models.Repository, doer *models.User, opts *DeleteRepo
message := strings.TrimSpace(opts.Message) 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) t, err := NewTemporaryUploadRepository(repo)
if err != nil { if err != nil {

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 // 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) // 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. // 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. // If only one of the two are provided, we set both of them to it.

2
modules/repofiles/update.go
View file

@ -168,7 +168,7 @@ func CreateOrUpdateRepoFile(repo *models.Repository, doer *models.User, opts *Up
message := strings.TrimSpace(opts.Message) 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) t, err := NewTemporaryUploadRepository(repo)
if err != nil { if err != nil {