From 442ab7d96ab8ac25d481e39f528b406b344e6305 Mon Sep 17 00:00:00 2001 From: VinaiRachakonda Date: Sun, 13 Dec 2020 13:17:42 -0500 Subject: [PATCH] formating --- go/libraries/doltcore/sqle/dfunctions/merge.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/go/libraries/doltcore/sqle/dfunctions/merge.go b/go/libraries/doltcore/sqle/dfunctions/merge.go index 716d45e9a5..9119c56059 100644 --- a/go/libraries/doltcore/sqle/dfunctions/merge.go +++ b/go/libraries/doltcore/sqle/dfunctions/merge.go @@ -43,9 +43,14 @@ func NewMergeFunc(args ...sql.Expression) (sql.Expression, error) { func (cf *MergeFunc) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) { sess := sqle.DSessFromSess(ctx.Session) - // Get the params associated with MERGE. We can share the commit argparser for now. + // TODO: Move to a separate MERGE argparser. ap := cli.CreateCommitArgParser() args, err := getDoltArgs(ctx, row, cf.Children()) + + if err != nil { + return nil, err + } + apr := cli.ParseArgs(ap, args, nil) // The fist argument should be the branch name.