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

PR feedback

Browse Source
This commit is contained in:
Zach Musgrave
2021-08-05 12:51:29 -07:00
parent 5b1aa2f3ef
commit bfe976375f
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
go/libraries/doltcore/dtestutils/testcommands/command.go
View File

@@ -12,6 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
// Package testcommands TODO: kill off this package, replace with the non-test commands directly
package testcommands
import (

2
go/libraries/doltcore/env/actions/staged.go vendored
View File

@@ -26,7 +26,7 @@ func StageTables(ctx context.Context, roots doltdb.Roots, docs doltdocs.Docs, tb
var err error
roots.Working, err = doltdocs.UpdateRootWithDocs(ctx, roots.Working, docs)
if err != nil {
return doltdb.Roots{}, nil
return doltdb.Roots{}, err
}
}

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

@@ -946,6 +946,7 @@ func (dEnv *DoltEnv) TempTableFilesDir() string {
}
// GetGCKeepers returns the hashes of all the objects in the environment provided that should be perserved during GC.
// TODO: this should be unnecessary since we now store the working set in a noms dataset, remove it
func GetGCKeepers(ctx context.Context, env *DoltEnv) ([]hash.Hash, error) {
workingRoot, err := env.WorkingRoot(ctx)
if err != nil {