mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-05-01 20:00:22 -05:00
Code Issues Packages Projects Releases 159 Wiki Activity

Cleanup misrenamed symbols (#1584)

Browse Source
This commit is contained in:
Rafael Weinstein
2016-05-21 13:02:39 -07:00
parent d1e2aa01f3
commit 4e9e43c27e
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/noms-ds/noms_ds.go
+1 -1
View File
@@ -32,7 +32,7 @@ func main() {
set, err := setSpec.Dataset()
util.CheckError(err)
oldCommitRef, errBool := set.MaybeHeadHash()
oldCommitRef, errBool := set.MaybeHeadRef()
if !errBool {
util.CheckError(fmt.Errorf("Dataset %v not found", set.ID()))
}
cmd/noms-log/noms_log_test.go
+2 -2
View File
@@ -57,11 +57,11 @@ func addCommitWithValue(ds dataset.Dataset, v types.Value) (dataset.Dataset, err
}
func addBranchedDataset(newDs, parentDs dataset.Dataset, v string) (dataset.Dataset, error) {
return newDs.CommitWithParents(types.NewString(v), types.NewSet().Insert(parentDs.HeadHash()))
return newDs.CommitWithParents(types.NewString(v), types.NewSet().Insert(parentDs.HeadRef()))
}
func mergeDatasets(ds1, ds2 dataset.Dataset, v string) (dataset.Dataset, error) {
return ds1.CommitWithParents(types.NewString(v), types.NewSet(ds1.HeadHash(), ds2.HeadHash()))
return ds1.CommitWithParents(types.NewString(v), types.NewSet(ds1.HeadRef(), ds2.HeadRef()))
}
func (s *nomsShowTestSuite) TestNomsGraph1() {