Skip to content

Commit

Permalink
Fixed errors that made jscs complain
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolas-van committed Sep 5, 2019
1 parent 5f38f82 commit a0ad3f0
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ var config = {
emailAliases: {
"[email protected]": "[email protected]"
},

branch: null
};

Expand Down Expand Up @@ -148,7 +147,7 @@ function parseArgs() {
)
.option(
'-m, --merge-request [false|true]',
'Include merge requests into calculation. ' +
'Include merge requests into calculation. ' +
' Default: ' + config.mergeRequest,
String
)
Expand Down Expand Up @@ -248,7 +247,8 @@ function mergeDefaultsWithArgs(conf) {
since: program.since || conf.since,
until: program.until || conf.until,
gitPath: program.path || conf.gitPath,
mergeRequest: program.mergeRequest !== undefined ? (program.mergeRequest == "true") : conf.mergeRequest,
mergeRequest: program.mergeRequest !== undefined ? (program.mergeRequest == "true") :
conf.mergeRequest,
branch: program.branch || conf.branch
};
}
Expand Down Expand Up @@ -320,7 +320,7 @@ function getCommits(gitPath, branch) {
return item.sha;
});

return uniqueCommits.filter(function (commit) {
return uniqueCommits.filter(function(commit) {
// Exclude all commits starting with "Merge ..."
if (!config.mergeRequest && commit.message.startsWith("Merge ")) {
return false;
Expand Down

0 comments on commit a0ad3f0

Please sign in to comment.