Skip to content

Commit 0e680c0

Browse files
authored
STCLI-258 Check for main branch in stripes platform pull command. (#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)
1 parent 65e5e5a commit 0e680c0

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

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

89
## [3.2.0](https://github.com/folio-org/stripes-cli/tree/v3.2.0) (2024-10-09)
910
[Full Changelog](https://github.com/folio-org/stripes-cli/compare/v3.1.0...v3.2.0)

lib/commands/platform/pull.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ function pullRepository(dir) {
2222
if (status.ahead) {
2323
reject(new Error('Branch contains committed changes to push.'));
2424
}
25-
if (status.current !== 'master') {
26-
reject(new Error(`Branch is not master. (${status.current})`));
25+
if (status.current !== 'master' && status.current !== 'main') {
26+
reject(new Error(`Branch is not master or main. (${status.current})`));
2727
}
2828
resolve(status);
2929
})

0 commit comments

Comments
 (0)