Skip to content

Commit

Permalink
Merge pull request #16 from capricorn86/fix-validate-pr-commit-messages
Browse files Browse the repository at this point in the history
fix: [#1] Fixes validate PR commit messages when using a master branc…
  • Loading branch information
capricorn86 authored Jan 29, 2024
2 parents ba08711 + dcbefda commit 45cd558
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions bin/happy-validate-pr-commit-messages.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,9 @@ function getCommitMessages(mainBranch) {
}

function getMainBranch() {
return new Promise((resolve, reject) => {
ChildProcess.exec(`git branch -r | grep origin/main`, (error, stdout) => {
if (error) {
reject(error);
} else {
resolve(stdout.trim() === 'origin/main' ? 'main' : 'master');
}
return new Promise((resolve) => {
ChildProcess.exec(`git branch -r | grep origin/main`, (_error, stdout) => {
resolve(stdout.includes('origin/main') ? 'main' : 'master');
});
});
}
Expand Down

0 comments on commit 45cd558

Please sign in to comment.