mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-09 10:38:10 -06:00
Code Issues Packages Projects Releases 127 Wiki Activity

Merge branch 'zachmu/cleanup' of github.com:dolthub/dolt into zachmu/cleanup

Browse Source
This commit is contained in:
Zach Musgrave
2021-08-05 12:51:35 -07:00
parent bfe976375f 4a75e8bbd2
commit 00624bcad9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
go/libraries/doltcore/dtestutils/environment.go
View File

@@ -18,11 +18,11 @@ import (
"context"
"testing"
"github.com/dolthub/dolt/go/libraries/doltcore/schema"
"github.com/stretchr/testify/require"
"github.com/dolthub/dolt/go/libraries/doltcore/doltdb"
"github.com/dolthub/dolt/go/libraries/doltcore/env"
"github.com/dolthub/dolt/go/libraries/doltcore/schema"
"github.com/dolthub/dolt/go/libraries/doltcore/schema/encoding"
"github.com/dolthub/dolt/go/libraries/doltcore/table"
"github.com/dolthub/dolt/go/libraries/doltcore/table/editor"
@@ -137,4 +137,4 @@ func putTableToWorking(ctx context.Context, dEnv *env.DoltEnv, sch schema.Schema
}
return dEnv.UpdateWorkingRoot(ctx, newRoot)
}
}

2
go/libraries/doltcore/env/environment.go vendored
View File

@@ -1000,4 +1000,4 @@ func GetGCKeepers(ctx context.Context, env *DoltEnv) ([]hash.Hash, error) {
}
return keepers, nil
}
}