Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

STCLI-258 Check for main branch in stripes platform pull command. #366

Merged
merged 1 commit into from
Jan 13, 2025
Merged

STCLI-258 Check for main branch in stripes platform pull command. #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

* Prune STS headers, permitting local non-SSL access via proxy. Refs STCLI-248.
* Turn off `<StrictMode>` when running tests. Refs STCLI-256.
* Check for `main` branch in `stripes platform pull` command. Refs STCLI-258.

## [3.2.0](https://github.com/folio-org/stripes-cli/tree/v3.2.0) (2024-10-09)
[Full Changelog](https://github.com/folio-org/stripes-cli/compare/v3.1.0...v3.2.0)
Expand Down
4 changes: 2 additions & 2 deletions lib/commands/platform/pull.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ function pullRepository(dir) {
if (status.ahead) {
reject(new Error('Branch contains committed changes to push.'));
}
if (status.current !== 'master') {
reject(new Error(`Branch is not master. (${status.current})`));
if (status.current !== 'master' && status.current !== 'main') {
reject(new Error(`Branch is not master or main. (${status.current})`));
}
resolve(status);
})
Expand Down
Loading