[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

go/libraries/doltcore/cherry_pick/cherry_pick.go

@@ -64,7 +64,7 @@ func NewCherryPickOptions() CherryPickOptions {
 		CommitMessage:              "",
 		CommitBecomesEmptyHandling: doltdb.ErrorOnEmptyCommit,
 		EmptyCommitHandling:        doltdb.ErrorOnEmptyCommit,
-		SkipVerification:          false,
+		SkipVerification:           false,
 	}
 }
 
@@ -163,9 +163,9 @@ func CreateCommitStagedPropsFromCherryPickOptions(ctx *sql.Context, options Cher
 	}
 
 	commitProps := actions.CommitStagedProps{
-		Date:      originalMeta.Time(),
-		Name:      originalMeta.Name,
-		Email:     originalMeta.Email,
+		Date:             originalMeta.Time(),
+		Name:             originalMeta.Name,
+		Email:            originalMeta.Email,
 		SkipVerification: options.SkipVerification,
 	}
 

go/libraries/doltcore/sqle/dprocedures/dolt_commit.go

@@ -163,14 +163,14 @@ func doDoltCommit(ctx *sql.Context, args []string) (string, bool, error) {
 	}
 
 	csp := actions.CommitStagedProps{
-		Message:    msg,
-		Date:       t,
-		AllowEmpty: apr.Contains(cli.AllowEmptyFlag),
-		SkipEmpty:  apr.Contains(cli.SkipEmptyFlag),
-		Amend:      amend,
-		Force:      apr.Contains(cli.ForceFlag),
-		Name:       name,
-		Email:      email,
+		Message:          msg,
+		Date:             t,
+		AllowEmpty:       apr.Contains(cli.AllowEmptyFlag),
+		SkipEmpty:        apr.Contains(cli.SkipEmptyFlag),
+		Amend:            amend,
+		Force:            apr.Contains(cli.ForceFlag),
+		Name:             name,
+		Email:            email,
 		SkipVerification: apr.Contains(cli.SkipVerificationFlag),
 	}
 
@@ -216,7 +216,6 @@ func doDoltCommit(ctx *sql.Context, args []string) (string, bool, error) {
 		pendingCommit.CommitOptions.Meta.Signature = string(signature)
 	}
 
-
 	newCommit, err := dSess.DoltCommit(ctx, dbName, dSess.GetTransaction(), pendingCommit)
 	if err != nil {
 		return "", false, err
@@ -274,4 +273,3 @@ func commitSignatureStr(ctx *sql.Context, dbName string, roots doltdb.Roots, csp
 
 	return strings.Join(lines, "\n"), nil
 }
-

go/libraries/doltcore/sqle/dprocedures/dolt_merge.go

@@ -449,11 +449,11 @@ func executeNoFFMerge(
 	}
 
 	pendingCommit, err := dSess.NewPendingCommit(ctx, dbName, roots, actions.CommitStagedProps{
-		Message:   msg,
-		Date:      spec.Date,
-		Force:     spec.Force,
-		Name:      spec.Name,
-		Email:     spec.Email,
+		Message:          msg,
+		Date:             spec.Date,
+		Force:            spec.Force,
+		Name:             spec.Name,
+		Email:            spec.Email,
 		SkipVerification: skipVerification,
 	})
 	if err != nil {

go/libraries/doltcore/sqle/dsess/session.go

@@ -45,7 +45,6 @@ import (
 
 var ErrSessionNotPersistable = errors.New("session is not persistable")
 
-
 // DoltSession is the sql.Session implementation used by dolt. It is accessible through a *sql.Context instance
 type DoltSession struct {
 	provider DoltDatabaseProvider

go/libraries/doltcore/sqle/enginetest/dolt_queries_commit_verification.go

@@ -17,11 +17,12 @@ package enginetest
 import (
 	"regexp"
 
-	"github.com/dolthub/dolt/go/store/hash"
 	"github.com/dolthub/go-mysql-server/enginetest"
 	"github.com/dolthub/go-mysql-server/enginetest/queries"
 	"github.com/dolthub/go-mysql-server/sql"
 	"github.com/dolthub/go-mysql-server/sql/types"
+
+	"github.com/dolthub/dolt/go/store/hash"
 )
 
 // commitHashValidator validates commit hash format (32 character hex)

go/libraries/doltcore/sqle/system_variables.go

@@ -18,11 +18,11 @@ import (
 	"math"
 	"time"
 
-	"github.com/dolthub/dolt/go/libraries/doltcore/env/actions"
 	"github.com/dolthub/go-mysql-server/sql"
 	"github.com/dolthub/go-mysql-server/sql/types"
 	_ "github.com/dolthub/go-mysql-server/sql/variables"
 
+	"github.com/dolthub/dolt/go/libraries/doltcore/env/actions"
 	"github.com/dolthub/dolt/go/libraries/doltcore/sqle/dsess"
 )