mirror of
https://github.com/dolthub/dolt.git
synced 2026-03-11 01:55:08 -05:00
Merge pull request #9034 from dolthub/macneale4/tmp-tmp
Be more flexible for missing working sets when loading db
This commit is contained in:
@@ -1560,8 +1560,10 @@ func initialStateForBranchDb(ctx *sql.Context, srcDb dsess.SqlDatabase) (dsess.I
|
||||
return dsess.InitialDbState{}, err
|
||||
}
|
||||
|
||||
// Working set may not exist. Upstream code which calls here must
|
||||
// handle the WorkingSet field being nil.q
|
||||
ws, err := srcDb.DbData().Ddb.ResolveWorkingSetAtRoot(ctx, wsRef, rootHash)
|
||||
if err != nil {
|
||||
if err != nil && err != doltdb.ErrWorkingSetNotFound {
|
||||
return dsess.InitialDbState{}, err
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user