diff --git a/go/libraries/doltcore/dbfactory/aws.go b/go/libraries/doltcore/dbfactory/aws.go index e7586909ea9..9248dd5121a 100644 --- a/go/libraries/doltcore/dbfactory/aws.go +++ b/go/libraries/doltcore/dbfactory/aws.go @@ -246,7 +246,7 @@ func awsConfigFromParams(ctx context.Context, params map[string]interface{}) (aw cfg, err := config.LoadDefaultConfig(ctx, opts...) var profileErr config.SharedConfigProfileNotExistError if errors.As(err, &profileErr) { - // XXX: Dolt was originaly using aws-sdk-go, which was + // XXX: Dolt was originally using aws-sdk-go, which was // happy to load the specified shared profile from // places like AWS_CONFIG_FILE or $HOME/.aws/config, // but did not complain if it could not find it. diff --git a/go/libraries/doltcore/sqle/writer/noms_write_session.go b/go/libraries/doltcore/sqle/writer/noms_write_session.go index a538774735c..65940c7109f 100644 --- a/go/libraries/doltcore/sqle/writer/noms_write_session.go +++ b/go/libraries/doltcore/sqle/writer/noms_write_session.go @@ -74,7 +74,7 @@ func (s *nomsWriteSession) GetWorkingSet() *doltdb.WorkingSet { func (s *nomsWriteSession) GetTableWriter(ctx *sql.Context, table doltdb.TableName, db string, setter dsess.SessionRootSetter, targetStaging bool) (dsess.TableWriter, error) { if targetStaging { // This would be fairly easy to implement, but we gotta stop luggin around the legacy storage format. - return nil, fmt.Errorf("Feature not suppported in legacy storage format") + return nil, fmt.Errorf("Feature not supported in legacy storage format") } s.mut.Lock() diff --git a/go/store/nbs/store.go b/go/store/nbs/store.go index 9db7793a943..14a4e540062 100644 --- a/go/store/nbs/store.go +++ b/go/store/nbs/store.go @@ -110,7 +110,7 @@ type NomsBlockStore struct { cond *sync.Cond // |true| after BeginGC is called, and false once the corresponding EndGC call returns. gcInProgress bool - // When unlocked read operations are occuring against the + // When unlocked read operations are occurring against the // block store, and they started when |gcInProgress == true|, // this variable is incremented. EndGC will not return until // no outstanding reads are in progress. diff --git a/integration-tests/bats/checkout.bats b/integration-tests/bats/checkout.bats index 41d322f58f8..85a974df7ac 100755 --- a/integration-tests/bats/checkout.bats +++ b/integration-tests/bats/checkout.bats @@ -87,7 +87,7 @@ SQL [ "$status" -eq 0 ] [[ "$output" =~ "new table" ]] || false - # Now check the table into main and make additonal changes + # Now check the table into main and make additional changes dolt add . && dolt commit -m "new table" dolt sql -q "insert into t2 values (2);" @@ -444,7 +444,7 @@ SQL dolt checkout -b test-branch dolt sql -q 'insert into test (id, id2) values (0, 2);' dolt add . - dolt commit -m "conclicting commit message" + dolt commit -m "conflicting commit message" shaparent1=$(dolt log --oneline --decorate=no | head -n 1 | cut -d ' ' -f 1) # remove special characters (color) @@ -478,7 +478,7 @@ SQL dolt checkout -b test-branch dolt sql -q 'insert into test (id, id2) values (0, 2);' dolt add . - dolt commit -m "conclicting commit message" + dolt commit -m "conflicting commit message" shaparent1=$(dolt log --oneline --decorate=no | head -n 1 | cut -d ' ' -f 1) # remove special characters (color) diff --git a/integration-tests/bats/foreign-keys.bats b/integration-tests/bats/foreign-keys.bats index e8868a40e92..bdb99d8abb2 100644 --- a/integration-tests/bats/foreign-keys.bats +++ b/integration-tests/bats/foreign-keys.bats @@ -1720,7 +1720,7 @@ SQL dolt commit -m "committed" } -@test "foreign-keys: deleting and readding" { +@test "foreign-keys: deleting and reading" { dolt sql <