diff options
Diffstat (limited to 'internal/git')
-rw-r--r-- | internal/git/command.go | 2 | ||||
-rw-r--r-- | internal/git/gittest/command.go | 2 | ||||
-rw-r--r-- | internal/git/gittest/commit_test.go | 2 | ||||
-rw-r--r-- | internal/git/gittest/tree_test.go | 2 | ||||
-rw-r--r-- | internal/git/housekeeping/clean_stale_data.go | 2 | ||||
-rw-r--r-- | internal/git/housekeeping/objects.go | 2 | ||||
-rw-r--r-- | internal/git/housekeeping/optimize_repository.go | 2 | ||||
-rw-r--r-- | internal/git/localrepo/commit.go | 6 | ||||
-rw-r--r-- | internal/git/localrepo/merge.go | 2 | ||||
-rw-r--r-- | internal/git/localrepo/tree.go | 2 | ||||
-rw-r--r-- | internal/git/localrepo/tree_test.go | 2 | ||||
-rw-r--r-- | internal/git/updateref/updateref.go | 2 |
12 files changed, 14 insertions, 14 deletions
diff --git a/internal/git/command.go b/internal/git/command.go index f5645fc96..d14568856 100644 --- a/internal/git/command.go +++ b/internal/git/command.go @@ -18,7 +18,7 @@ var ( // Command represent a Git command. type Command struct { - // Name is the name of the Git command to run, e.g. "log", "cat-flie" or "worktree". + // Name is the name of the Git command to run, e.g. "log", "cat-file" or "worktree". Name string // Action is the action of the Git command, e.g. "set-url" in `git remote set-url` Action string diff --git a/internal/git/gittest/command.go b/internal/git/gittest/command.go index c5eef143c..c917388e9 100644 --- a/internal/git/gittest/command.go +++ b/internal/git/gittest/command.go @@ -128,7 +128,7 @@ type RepositoryPathExecutor struct { factory git.CommandFactory } -// NewRepositoryPathExecutor creates a new ReposiotryPathExecutor for the given repository. +// NewRepositoryPathExecutor creates a new RepositoryPathExecutor for the given repository. func NewRepositoryPathExecutor(tb testing.TB, cfg config.Cfg, repoPath string) RepositoryPathExecutor { relativePath, err := filepath.Rel(cfg.Storages[0].Path, repoPath) require.NoError(tb, err) diff --git a/internal/git/gittest/commit_test.go b/internal/git/gittest/commit_test.go index 4f35f7ad2..9efb5a9ac 100644 --- a/internal/git/gittest/commit_test.go +++ b/internal/git/gittest/commit_test.go @@ -69,7 +69,7 @@ func TestWriteCommit(t *testing.T) { }, "\n"), }, { - desc: "with commiter", + desc: "with committer", opts: []WriteCommitOption{ WithCommitterName("John Doe"), WithCommitterDate(time.Date(2005, 4, 7, 15, 13, 13, 0, time.FixedZone("UTC-7", -7*60*60))), diff --git a/internal/git/gittest/tree_test.go b/internal/git/gittest/tree_test.go index c922deb31..35d37ef0f 100644 --- a/internal/git/gittest/tree_test.go +++ b/internal/git/gittest/tree_test.go @@ -120,7 +120,7 @@ func TestWriteTree(t *testing.T) { }, }, { - desc: "two entries with nonexistant objects", + desc: "two entries with nonexistent objects", entries: []TreeEntry{ { OID: git.ObjectID(strings.Repeat("1", DefaultObjectHash.Hash().Size()*2)), diff --git a/internal/git/housekeeping/clean_stale_data.go b/internal/git/housekeeping/clean_stale_data.go index 22149d639..a425449e3 100644 --- a/internal/git/housekeeping/clean_stale_data.go +++ b/internal/git/housekeeping/clean_stale_data.go @@ -290,7 +290,7 @@ func findStaleFiles(repoPath string, gracePeriod time.Duration, files ...string) } // findStaleLockfiles finds a subset of lockfiles which may be created by git -// commands. We're quite conservative with what we're removing, we certaintly +// commands. We're quite conservative with what we're removing, we certainly // don't just scan the repo for `*.lock` files. Instead, we only remove a known // set of lockfiles which have caused problems in the past. func findStaleLockfiles(ctx context.Context, repoPath string) ([]string, error) { diff --git a/internal/git/housekeeping/objects.go b/internal/git/housekeeping/objects.go index d83a13ef5..c3d4c3696 100644 --- a/internal/git/housekeeping/objects.go +++ b/internal/git/housekeeping/objects.go @@ -153,7 +153,7 @@ func RepackObjects(ctx context.Context, repo *localrepo.Repo, cfg RepackObjectsC }, }, // Note: we explicitly do not pass `GetRepackGitConfig()` here as none of - // its opitons apply to this kind of repack: we have no delta islands given + // its options apply to this kind of repack: we have no delta islands given // that we do not walk the revision graph, and we won't ever write bitmaps. git.WithStderr(&stderr), ); err != nil { diff --git a/internal/git/housekeeping/optimize_repository.go b/internal/git/housekeeping/optimize_repository.go index 1dc0d9337..0396d39ad 100644 --- a/internal/git/housekeeping/optimize_repository.go +++ b/internal/git/housekeeping/optimize_repository.go @@ -160,7 +160,7 @@ func optimizeRepository( timer := prometheus.NewTimer(m.tasksLatency.WithLabelValues("clean-stale-data")) if err := m.CleanStaleData(ctx, repo, DefaultStaleDataCleanup()); err != nil { - return fmt.Errorf("could not execute houskeeping: %w", err) + return fmt.Errorf("could not execute housekeeping: %w", err) } timer.ObserveDuration() diff --git a/internal/git/localrepo/commit.go b/internal/git/localrepo/commit.go index 2f77069ef..bdb7bb990 100644 --- a/internal/git/localrepo/commit.go +++ b/internal/git/localrepo/commit.go @@ -21,13 +21,13 @@ import ( ) var ( - // ErrMissingTree indicates a missing tree when attemping to write a commit + // ErrMissingTree indicates a missing tree when attempting to write a commit ErrMissingTree = errors.New("missing tree") // ErrMissingCommitterName indicates an attempt to write a commit without a - // comitter name + // committer name ErrMissingCommitterName = errors.New("missing committer name") // ErrMissingAuthorName indicates an attempt to write a commit without a - // comitter name + // committer name ErrMissingAuthorName = errors.New("missing author name") // ErrDisallowedCharacters indicates the name and/or email contains disallowed // characters 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); { diff --git a/internal/git/localrepo/tree.go b/internal/git/localrepo/tree.go index b436e4c56..ed8464999 100644 --- a/internal/git/localrepo/tree.go +++ b/internal/git/localrepo/tree.go @@ -504,7 +504,7 @@ func (t *TreeEntry) populate( stack := treeStack{t} - // The outpout of ls-tree -r is the following: + // The output of ls-tree -r is the following: // a1 // dir1/file2 // dir2/file3 diff --git a/internal/git/localrepo/tree_test.go b/internal/git/localrepo/tree_test.go index 3e7398f18..a68999d12 100644 --- a/internal/git/localrepo/tree_test.go +++ b/internal/git/localrepo/tree_test.go @@ -1393,7 +1393,7 @@ func TestTreeEntry_Delete(t *testing.T) { }, }, { - desc: "nested tree with only single childs", + desc: "nested tree with only single child", tree: &TreeEntry{ Type: Tree, Mode: "040000", diff --git a/internal/git/updateref/updateref.go b/internal/git/updateref/updateref.go index 9979e7d83..b8a86df1d 100644 --- a/internal/git/updateref/updateref.go +++ b/internal/git/updateref/updateref.go @@ -360,7 +360,7 @@ func (u *Updater) checkState(expected state) error { return nil } -// Start begins a new reference transaction. The reference changes are not perfromed until Commit +// Start begins a new reference transaction. The reference changes are not performed until Commit // is explicitly called. func (u *Updater) Start() error { if err := u.expectState(stateIdle); err != nil { |