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/git/localrepo/merge.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/git/localrepo/merge.go')
| -rw-r--r-- | internal/git/localrepo/merge.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/internal/git/localrepo/merge.go b/internal/git/localrepo/merge.go index c721268ba..44bbae3ef 100644 --- a/internal/git/localrepo/merge.go +++ b/internal/git/localrepo/merge.go @@ -167,7 +167,7 @@ func parseMergeTreeError(objectHash git.ObjectHash, cfg mergeTreeConfig, output } fields := strings.Split(infoMsg, "\x00") - // The git output contains a null characted at the end, which creates a stray empty field. + // The git output contains a null character at the end, which creates a stray empty field. fields = fields[:len(fields)-1] for i := 0; i < len(fields); { |