mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-26 00:51:33 -06:00
Code Issues Packages Projects Releases 138 Wiki Activity

Merge pull request #6311 from dolthub/pavel/bug-6306

Browse Source
This commit is contained in:
Pavel Safronov
2023-07-11 08:38:27 -10:00
committed by GitHub
parent 3eb8fc7a18 48789dcfe9
commit 7af5d72e7b
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -679,10 +679,16 @@ type repoStateReader struct {
}
func (r *repoStateReader) CWBHeadRef() (ref.DoltRef, error) {
if r.RepoState == nil && r.RSLoadErr != nil {
return nil, r.RSLoadErr
}
return r.RepoState.CWBHeadRef(), nil
}
func (r *repoStateReader) CWBHeadSpec() (*doltdb.CommitSpec, error) {
if r.RepoState == nil && r.RSLoadErr != nil {
return nil, r.RSLoadErr
}
return r.RepoState.CWBHeadSpec(), nil
}
@@ -695,6 +701,10 @@ type repoStateWriter struct {
}
func (r *repoStateWriter) SetCWBHeadRef(ctx context.Context, marshalableRef ref.MarshalableRef) error {
if r.RepoState == nil && r.RSLoadErr != nil {
return r.RSLoadErr
}
r.RepoState.Head = marshalableRef
err := r.RepoState.Save(r.FS)