mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-09 10:38:10 -06:00
Code Issues Packages Projects Releases 127 Wiki Activity

Edit dolt merge ret type again (#1967)

Browse Source
This commit is contained in:
Vinai Rachakonda
2021-08-03 17:05:46 -07:00
committed by GitHub
parent a51926d02e
commit 9d434dc57b
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
go/libraries/doltcore/sqle/dfunctions/dolt_merge.go
View File

@@ -60,7 +60,7 @@ func (d DoltMergeFunc) Eval(ctx *sql.Context, row sql.Row) (interface{}, error)
args, err := getDoltArgs(ctx, row, d.Children())
if err != nil {
return nil, err
return noConflicts, err
}
apr, err := ap.Parse(args)
@@ -74,7 +74,7 @@ func (d DoltMergeFunc) Eval(ctx *sql.Context, row sql.Row) (interface{}, error)
ws, err := sess.WorkingSet(ctx, dbName)
if err != nil {
return nil, err
return noConflicts, err
}
roots, ok := sess.GetRoots(ctx, dbName)
@@ -99,7 +99,7 @@ func (d DoltMergeFunc) Eval(ctx *sql.Context, row sql.Row) (interface{}, error)
return noConflicts, err
}
return "Merge aborted", nil
return noConflicts, nil
}
ddb, ok := sess.GetDoltDB(ctx, dbName)
@@ -129,7 +129,7 @@ func (d DoltMergeFunc) Eval(ctx *sql.Context, row sql.Row) (interface{}, error)
}
branchName := apr.Arg(0)
mergeCommit, cmh, err := getBranchCommit(ctx, branchName, ddb)
mergeCommit, _, err := getBranchCommit(ctx, branchName, ddb)
if err != nil {
return noConflicts, err
}
@@ -176,7 +176,7 @@ func (d DoltMergeFunc) Eval(ctx *sql.Context, row sql.Row) (interface{}, error)
}
if err != nil {
return nil, err
return noConflicts, err
}
return noConflicts, err
}
@@ -203,13 +203,7 @@ func (d DoltMergeFunc) Eval(ctx *sql.Context, row sql.Row) (interface{}, error)
return noConflicts, err
}
hch, err := headCommit.HashOf()
if err != nil {
return noConflicts, err
}
returnMsg := fmt.Sprintf("Updating %s..%s", hch.String(), cmh.String())
return returnMsg, nil
return noConflicts, nil
}
func abortMerge(ctx *sql.Context, workingSet *doltdb.WorkingSet, roots doltdb.Roots) (*doltdb.WorkingSet, error) {