From b3c800f5856f1ee313602422825ceb178da6f538 Mon Sep 17 00:00:00 2001 From: Neil Macneale IV Date: Thu, 1 Feb 2024 14:25:21 -0800 Subject: [PATCH] Bring back the check since many tests broke. Use the correct DB though. --- go/libraries/doltcore/env/actions/remotes.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/go/libraries/doltcore/env/actions/remotes.go b/go/libraries/doltcore/env/actions/remotes.go index 0a124304b0..6172cc425f 100644 --- a/go/libraries/doltcore/env/actions/remotes.go +++ b/go/libraries/doltcore/env/actions/remotes.go @@ -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 {