Skip to content

Commit

Permalink
STCLI-258 Check for main branch in stripes platform pull command. (
Browse files Browse the repository at this point in the history
…#366)

## Description
Since a few of UI modules are now using `main` instead of `master`
branch we should update the pull command to check for it also.

## Issues
[STCLI-258](https://folio-org.atlassian.net/browse/STCLI-258)
  • Loading branch information
BogdanDenis authored Jan 13, 2025
1 parent 65e5e5a commit 0e680c0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
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
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

0 comments on commit 0e680c0

Please sign in to comment.