Merge pull request #41 from pmiossec/fix_branch_option

Fix branch option
rafinskipg · May 8, 2016 · 6247118 · 6247118
2 parents 2e50373 + 4ce6128
commit 6247118
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/tasks/command.js b/tasks/command.js
@@ -40,8 +40,8 @@ if (process.argv.join('').replace(/\\/g,'/').indexOf('/grunt') === -1) {
     options.app_name = program.app_name;
   }
 
-  if (program.branch_name){
-    options.branch_name = program.branch_name;
+  if (program.branch){
+    options.branch_name = program.branch;
     console.log('  - Branch %s', program.branch);
   }
   if (program.debug){

diff --git a/tasks/lib/get-gitlog-commands.js b/tasks/lib/get-gitlog-commands.js
@@ -4,7 +4,7 @@ var debug = require('debug')('changelog:getGitLogCommands');
 
 function getGitLogCommands() {
   debug('getting log commands');
-  this.cmd.gitLog = 'git log ' + this.options.branch_name + ' --grep="%s" -E --format=%s %s..HEAD';
+  this.cmd.gitLog = 'git log --grep="%s" -E --format=%s %s..' + (this.options.branch_name ? this.options.branch_name : 'HEAD');
   this.cmd.gitLogNoTag = 'git log ' + this.options.branch_name + ' --grep="%s" -E --format=%s';
 }
 

diff --git a/test/git_changelog_generate.spec.js b/test/git_changelog_generate.spec.js
@@ -186,7 +186,8 @@ describe('git_changelog_generate.js', function() {
         changelog.options.branch_name = branch_name;
         changelog.getGitLogCommands();
 
-        expect(changelog.cmd.gitLog).to.include('git log ' + branch_name);
+        expect(changelog.cmd.gitLog).to.include('git log ')
+            .and.include('..' + branch_name);
         expect(changelog.cmd.gitLogNoTag).to.include('git log ' + branch_name);
       });