From f28be4cf2ceed4bce7ff969fd2b1184ff9f1e51c Mon Sep 17 00:00:00 2001 From: Zach Musgrave Date: Mon, 20 May 2024 18:04:20 -0700 Subject: [PATCH] Bug fix for pull leaving working set dirty when it's already up to date --- go/libraries/doltcore/sqle/dprocedures/dolt_pull.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/go/libraries/doltcore/sqle/dprocedures/dolt_pull.go b/go/libraries/doltcore/sqle/dprocedures/dolt_pull.go index 47dd51ded5..5ef20e7e37 100644 --- a/go/libraries/doltcore/sqle/dprocedures/dolt_pull.go +++ b/go/libraries/doltcore/sqle/dprocedures/dolt_pull.go @@ -204,11 +204,6 @@ func doDoltPull(ctx *sql.Context, args []string) (int, int, string, error) { if err != nil && !errors.Is(doltdb.ErrUpToDate, err) { return conflicts, fastForward, "", err } - - err = sess.SetWorkingSet(ctx, dbName, ws) - if err != nil { - return conflicts, fastForward, "", err - } } if !rsSeen { return noConflictsOrViolations, threeWayMerge, "", fmt.Errorf("%w: '%s'", ref.ErrInvalidRefSpec, refSpec.GetRemRefToLocal())