Merge pull request #9034 from dolthub/macneale4/tmp-tmp

Be more flexible for missing working sets when loading db
This commit is contained in:
Neil Macneale IV
2025-03-25 16:30:18 -07:00
committed by GitHub

View File

@@ -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
}