Skip to content

Commit

Permalink
chore: address @stevemao's code review
Browse files Browse the repository at this point in the history
  • Loading branch information
Benjamin Coe committed Mar 10, 2017
1 parent 12036eb commit c976c70
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions packages/conventional-changelog-core/lib/merge-config.js
Expand Up @@ -21,15 +21,15 @@ var rhosts = /github|bitbucket|gitlab/i;
var rtag = /tag:\s*[v=]?(.+?)[,\)]/gi;

function semverTagsPromise(options) {
var semverTagsDeferred = Q.defer();
gitSemverTags(function(err, result) {
if (err) {
semverTagsDeferred.reject(err);
} else {
semverTagsDeferred.resolve(result);
}
}, {lernaTags: !!options.lernaPackage, package: options.lernaPackage});
return semverTagsDeferred.promise;
return Q.Promise(function(resolve, reject) {
gitSemverTags(function(err, result) {
if (err) {
reject(err);
} else {
resolve(result);
}
}, {lernaTags: !!options.lernaPackage, package: options.lernaPackage});
});
}

function mergeConfig(options, context, gitRawCommitsOpts, parserOpts, writerOpts) {
Expand Down

0 comments on commit c976c70

Please sign in to comment.