From 18b96edd11ef8b3de78ea655051e6ca82234d96c Mon Sep 17 00:00:00 2001 From: Aaron Son Date: Thu, 30 Nov 2023 10:53:03 -0800 Subject: [PATCH] [no-release-notes] go/libraries/doltcore/env/actions: remotes.go: Small fix to SetHeadToCommit our local remote ref when pushing even in fast-forward mode. --- go/libraries/doltcore/env/actions/remotes.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/go/libraries/doltcore/env/actions/remotes.go b/go/libraries/doltcore/env/actions/remotes.go index 803617deee..d0cf126127 100644 --- a/go/libraries/doltcore/env/actions/remotes.go +++ b/go/libraries/doltcore/env/actions/remotes.go @@ -85,7 +85,10 @@ func Push(ctx context.Context, tempTableDir string, mode ref.UpdateMode, destRef if err != nil { return err } - err = srcDB.FastForward(ctx, remoteRef, commit) + // We set the remote ref to the commit here, regardless of its + // previous value. It does not need to be a FastForward update + // of the local ref for this operation to succeed. + err = srcDB.SetHeadToCommit(ctx, remoteRef, commit) } return err