diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2023-08-09 15:36:13 +0300 |
|---|---|---|
| committer | Christian Couder <chriscool@tuxfamily.org> | 2023-08-09 15:36:13 +0300 |
| commit | 0e78015ff2052203845e049be8b3395bac782554 (patch) | |
| tree | aab65d40d37ecd70311a598e7c9087588b1526cd | |
| parent | 9ac3aa26dfcd3107112cdf5dfbd328f2939f3379 (diff) | |
| parent | e2072f4c656745f61eae3559e5bb197ce9b35a5f (diff) | |
Merge branch 'pks-git-commit-fix-ident-tests' into 'master'
git: Fix tests to not consider dots in identities as crud anymore
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6181
Merged-by: Christian Couder <chriscool@tuxfamily.org>
Approved-by: Christian Couder <chriscool@tuxfamily.org>
Approved-by: Quang-Minh Nguyen <qmnguyen@gitlab.com>
Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com>
| -rw-r--r-- | internal/git/localrepo/commit_test.go | 2 | ||||
| -rw-r--r-- | internal/gitaly/service/operations/commit_files_test.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/internal/git/localrepo/commit_test.go b/internal/git/localrepo/commit_test.go index a5248066e..4e7b199e9 100644 --- a/internal/git/localrepo/commit_test.go +++ b/internal/git/localrepo/commit_test.go @@ -333,7 +333,7 @@ func testWriteCommitValidation(t *testing.T, ctx context.Context) { desc: "author name consists of invalid characters", cfg: WriteCommitConfig{ TreeID: treeID, - AuthorName: ".", + AuthorName: ",", AuthorEmail: "author@example.com", CommitterName: "Coe Mitter", CommitterEmail: "coemitter@example.com", diff --git a/internal/gitaly/service/operations/commit_files_test.go b/internal/gitaly/service/operations/commit_files_test.go index d850c9c63..16a85d488 100644 --- a/internal/gitaly/service/operations/commit_files_test.go +++ b/internal/gitaly/service/operations/commit_files_test.go @@ -1603,7 +1603,7 @@ func testSuccessfulUserCommitFilesRequestWithSpecialCharactersInSignature(t *tes }{ { desc: "special characters at start and end", - user: &gitalypb.User{Name: []byte(".,:;<>\"'\nJane Doe.,:;<>'\"\n"), Email: []byte(".,:;<>'\"\njanedoe@gitlab.com.,:;<>'\"\n"), GlId: gittest.GlID}, + user: &gitalypb.User{Name: []byte(",:;<>\"'\nJane Doe,:;<>'\"\n"), Email: []byte(",:;<>'\"\njanedoe@gitlab.com,:;<>'\"\n"), GlId: gittest.GlID}, author: &gitalypb.CommitAuthor{Name: []byte("Jane Doe"), Email: []byte("janedoe@gitlab.com")}, }, { |