Skip to content

Commit

Permalink
Bug fix for pull leaving working set dirty when it's already up to date
Browse files Browse the repository at this point in the history
  • Loading branch information
zachmu committed May 21, 2024
1 parent 935e765 commit f28be4c
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions go/libraries/doltcore/sqle/dprocedures/dolt_pull.go
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down

0 comments on commit f28be4c

Please sign in to comment.