small changes

This commit is contained in:
Stephanie You
2023-10-13 13:56:44 -07:00
parent fa50b5ba78
commit 72a5791c5c
2 changed files with 5 additions and 0 deletions

View File

@@ -302,6 +302,7 @@ func constructInterpolatedDoltMergeQuery(apr *argparser.ArgParseResults, cliCtx
// printMergeStats calculates and prints all merge stats and information.
func printMergeStats(result []sql.Row, apr *argparser.ArgParseResults, queryist cli.Queryist, sqlCtx *sql.Context, usage cli.UsagePrinter, headHash, mergeHash, fromRef, toRef string) int {
// dolt_merge returns hash, fast_forward, conflicts and dolt_pull returns fast_forward, conflicts
fastForward := false
if result != nil && len(result) > 0 {
ffIndex := 0

View File

@@ -290,6 +290,10 @@ func getRemoteHashForPull(apr *argparser.ArgParseResults, sqlCtx *sql.Context, q
branch = apr.Args[1]
}
if remote == "" || branch == "" {
return "", "", errors.New("pull finished successfully but remote and/or branch provided is empty")
}
remoteHash, err = getHashOf(queryist, sqlCtx, remote+"/"+branch)
if err != nil {
return "", "", err