Skip to content

change parameter to be more flexible #114

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

Open
JTMCaplin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

change parameter to be more flexible #114

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
8 changes: 4 additions & 4 deletions caplin-versioning/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ function getCommitCount() {
return execSync("git rev-list --count HEAD", execOptions).trim();
}

function getBranchDescriptor(defaultBranchName = "master") {
function getBranchDescriptor(dontAppendBranchName) {
let stdout;

// This approach to generating a version relies on the project being stored
Expand All @@ -38,11 +38,11 @@ function getBranchDescriptor(defaultBranchName = "master") {
// To prevent a trailing `-` being suffixed to the version if a
// `branchDescriptor` is available we prefix the descriptor with `-` if it
// exists else return a blank string.
return currentBranch === defaultBranchName ? "" : `-${currentBranch}`;
return dontAppendBranchName ? "" : `-${currentBranch}`;
}

module.exports = (semVer, { hashLength, masterBranchName } = {}) => {
const branchDescriptor = getBranchDescriptor(masterBranchName);
module.exports = (semVer, { hashLength, dontAppendBranchName } = {}) => {
const branchDescriptor = getBranchDescriptor(dontAppendBranchName);
const commitCount = getCommitCount();
const hash = getHash(hashLength);

Expand Down