diff options
| author | Xing Xin <xingxin.xx@bytedance.com> | 2024-01-02 06:10:48 +0300 |
|---|---|---|
| committer | Will Chandler <wchandler@gitlab.com> | 2024-01-17 22:12:43 +0300 |
| commit | 36339ff6300a2cc727441aa897e2793bd2fcd98a (patch) | |
| tree | 85abb862a6a39219643585785869aa626964cffb /internal/gitaly/service/conflicts/resolve_conflicts_test.go | |
| parent | 2f1b99e352ec5c4e270e7ecb9e4234244bf37dee (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/conflicts/resolve_conflicts_test.go')
| -rw-r--r-- | internal/gitaly/service/conflicts/resolve_conflicts_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/internal/gitaly/service/conflicts/resolve_conflicts_test.go b/internal/gitaly/service/conflicts/resolve_conflicts_test.go index 65c5fd71b..ac7faff31 100644 --- a/internal/gitaly/service/conflicts/resolve_conflicts_test.go +++ b/internal/gitaly/service/conflicts/resolve_conflicts_test.go @@ -1320,7 +1320,7 @@ func testResolveConflicts(t *testing.T, ctx context.Context) { skipCommitCheck: true, additionalChecks: func() { objectsAfter := len(strings.Split(text.ChompBytes(gittest.Exec(t, cfg, "-C", repoPath, "rev-list", "--objects", "--all")), "\n")) - require.Equal(t, objectsBefore, objectsAfter, "No new objets should've been added") + require.Equal(t, objectsBefore, objectsAfter, "No new objects should've been added") }, } }, |