Bring back the check since many tests broke. Use the correct DB though.

This commit is contained in:
Neil Macneale IV
2024-02-01 14:25:21 -08:00
parent f147d60947
commit b3c800f585
+9
View File
@@ -52,6 +52,15 @@ type ProgStopper func(cancel context.CancelFunc, wg *sync.WaitGroup, statsCh cha
// source db.
func Push(ctx context.Context, tempTableDir string, mode ref.UpdateMode, destRef ref.BranchRef, remoteRef ref.RemoteRef, srcDB, destDB *doltdb.DoltDB, commit *doltdb.Commit, statsCh chan pull.Stats) error {
var err error
if mode == ref.FastForwardOnly {
canFF, err := destDB.CanFastForward(ctx, destRef, commit)
if err != nil {
return err
} else if !canFF {
return ErrCantFF
}
}
h, err := commit.HashOf()
if err != nil {