From c794bf0103f9b24f8fbb61aa4e7e68f19434340c Mon Sep 17 00:00:00 2001 From: Zach Musgrave Date: Mon, 2 Aug 2021 14:14:07 -0700 Subject: [PATCH] Fixed some documentation typos --- go/cmd/dolt/commands/remote.go | 9 +++++---- go/libraries/doltcore/merge/merge.go | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/go/cmd/dolt/commands/remote.go b/go/cmd/dolt/commands/remote.go index aae3f7587a..2d130354cf 100644 --- a/go/cmd/dolt/commands/remote.go +++ b/go/cmd/dolt/commands/remote.go @@ -49,13 +49,14 @@ AWS cloud remote urls should be of the form {{.EmphasisLeft}}aws://[dynamo-table aws-creds-type specifies the means by which credentials should be retrieved in order to access the specified cloud resources (specifically the dynamo table, and the s3 bucket). Valid values are 'role', 'env', or 'file'. - \trole: Use the credentials installed for the current user - \tenv: Looks for environment variables AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY - \tfile: Uses the credentials file specified by the parameter aws-creds-file + role: Use the credentials installed for the current user + env: Looks for environment variables AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY + file: Uses the credentials file specified by the parameter aws-creds-file GCP remote urls should be of the form gs://gcs-bucket/database and will use the credentials setup using the gcloud command line available from Google + -The local filesystem can be used as a remote by providing a repository url in the format file://absolute path. See https://en.wikipedia.org/wiki/File_URI_schemethi +The local filesystem can be used as a remote by providing a repository url in the format file://absolute path. See https://en.wikipedia.org/wiki/File_URI_scheme + {{.EmphasisLeft}}remove{{.EmphasisRight}}, {{.EmphasisLeft}}rm{{.EmphasisRight}}, Remove the remote named {{.LessThan}}name{{.GreaterThan}}. All remote-tracking branches and configuration settings for the remote are removed.`, diff --git a/go/libraries/doltcore/merge/merge.go b/go/libraries/doltcore/merge/merge.go index 7c3a2379f4..25152a86f1 100644 --- a/go/libraries/doltcore/merge/merge.go +++ b/go/libraries/doltcore/merge/merge.go @@ -877,9 +877,9 @@ func MergeRoots(ctx context.Context, ourRoot, theirRoot, ancRoot *doltdb.RootVal if err != nil { return nil, nil, err } - } else if has, err := newRoot.HasTable(ctx, tblName); err != nil { + } else if newRootHasTable, err := newRoot.HasTable(ctx, tblName); err != nil { return nil, nil, err - } else if has { + } else if newRootHasTable { tblToStats[tblName] = &MergeStats{Operation: TableRemoved} err = tableEditSession.UpdateRoot(ctx, func(ctx context.Context, root *doltdb.RootValue) (*doltdb.RootValue, error) { return root.RemoveTables(ctx, tblName)