mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-20 11:22:31 -05:00
Code Issues Packages Projects Releases 156 Wiki Activity

Fixing broken build caused by changing return type of PullChunks

Browse Source
This commit is contained in:
Zach Musgrave
2019-03-18 17:23:58 -07:00
parent 48199e269f
commit 93e709d922
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
go/libraries/doltcore/env/actions/remotes.go vendored
View File

@@ -4,6 +4,7 @@ import (
"errors"
"github.com/attic-labs/noms/go/datas"
"github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb"
"github.com/liquidata-inc/ld/dolt/go/libraries/utils/pantoerr"
)
var ErrCantFF = errors.New("can't fast forward merge.")
@@ -17,7 +18,9 @@ func Push(branch, remoteBranch string, srcDB, destDB *doltdb.DoltDB, commit *dol
return ErrCantFF
}
err = destDB.PullChunks(srcDB, commit, progChan)
err = pantoerr.PanicToErrorNil("error pulling chunks", func() {
destDB.PullChunks(srcDB, commit, progChan)
})
if err != nil {
return err
@@ -35,7 +38,9 @@ func Push(branch, remoteBranch string, srcDB, destDB *doltdb.DoltDB, commit *dol
}
func Fetch(branch string, srcDB, destDB *doltdb.DoltDB, commit *doltdb.Commit, progChan chan datas.PullProgress) error {
err := destDB.PullChunks(srcDB, commit, progChan)
err := pantoerr.PanicToErrorNil("error pulling chunks", func() {
destDB.PullChunks(srcDB, commit, progChan)
})
if err != nil {
return err