Merge branch 'trunk' of github.com:cli/cli into jg/liveshare-keepalive

This commit is contained in:
Jose Garcia 2021-10-07 11:10:45 -04:00
commit 9c8351ecd8
2 changed files with 2 additions and 1 deletions

View file

@ -425,7 +425,7 @@ type CreateCodespaceParams struct {
func (a *API) CreateCodespace(ctx context.Context, params *CreateCodespaceParams) (*Codespace, error) {
codespace, err := a.startCreate(ctx, params.RepositoryID, params.Machine, params.Branch, params.Location)
if err != errProvisioningInProgress {
return nil, err
return codespace, err
}
// errProvisioningInProgress indicates that codespace creation did not complete

View file

@ -46,6 +46,7 @@ func NewManager(io *iostreams.IOStreams) *Manager {
platform: func() string {
return fmt.Sprintf("%s-%s", runtime.GOOS, runtime.GOARCH)
},
io: io,
}
}