* simple fix * fix test too * repair more twists use same sequence: first Author, then Commitertags/v1.11.0-rc1
@@ -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{ |
@@ -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", |
@@ -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 { |
@@ -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. |
@@ -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 { |