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.

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
Changes from all commits
Commits
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
STCLI-258 Check for main branch in stripes platform pull command.
BogdanDenis committed Jan 10, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 5832063562b47765d4c3117873ead4c143035469
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)
4 changes: 2 additions & 2 deletions lib/commands/platform/pull.js
Original file line number Diff line number Diff line change
@@ -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);
})