Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXing Xin <xingxin.xx@bytedance.com>2024-01-02 06:10:48 +0300
committerWill Chandler <wchandler@gitlab.com>2024-01-17 22:12:43 +0300
commit36339ff6300a2cc727441aa897e2793bd2fcd98a (patch)
tree85abb862a6a39219643585785869aa626964cffb /internal/gitaly/service/operations/merge_to_ref_test.go
parent2f1b99e352ec5c4e270e7ecb9e4234244bf37dee (diff)
fix: Fix a collection of typos found by typos-cli
Fix typos found by typos-cli(https://github.com/crate-ci/typos). Some affected tests are adjusted. There are a bunch of other typos are ignored, including * CHANGELOG.md * NOTICE * internal/.../migrations/20201208163237_cleanup_notifications_payload.go * other intended typos or false positives Signed-off-by: Xing Xin <xingxin.xx@bytedance.com>
Diffstat (limited to 'internal/gitaly/service/operations/merge_to_ref_test.go')
-rw-r--r--internal/gitaly/service/operations/merge_to_ref_test.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/internal/gitaly/service/operations/merge_to_ref_test.go b/internal/gitaly/service/operations/merge_to_ref_test.go
index 28863e136..3781ffd71 100644
--- a/internal/gitaly/service/operations/merge_to_ref_test.go
+++ b/internal/gitaly/service/operations/merge_to_ref_test.go
@@ -218,7 +218,7 @@ func testUserMergeToRefConflicts(t *testing.T, ctx context.Context) {
require.False(t, hasRevision, "branch should not have been created")
})
- t.Run("target reference is ambigous", func(t *testing.T) {
+ t.Run("target reference is ambiguous", func(t *testing.T) {
gittest.WriteRef(t, cfg, repoPath, "refs/merge-requests/x/written-before", right)
request := &gitalypb.UserMergeToRefRequest{