Merge d6cf76e into 2541d57

nknapp · Jan 26, 2016 · e16d759 · e16d759
2 parents 2541d57 + d6cf76e
commit e16d759
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/lib/git.js b/lib/git.js
@@ -184,7 +184,7 @@ function Git (dir) {
           // Squash
           .then((mergeBase) => this.spawn('-c', `sequence.editor=${thoughtful} sequence-editor`, 'rebase', '--interactive', mergeBase.stdout.trim()))
           // Rebase on target branch
-          .then(() => this.run('rebase', '--fork-point', targetBranch).invoke('appendTo', tagOutput.appendTo('')))
+          .then(() => this.run('rebase', targetBranch).invoke('appendTo', tagOutput.appendTo('')))
       })
   }
 }

diff --git a/test/fixtures/index-spec/CHANGELOG-first.md b/test/fixtures/index-spec/CHANGELOG-first.md
@@ -3,4 +3,4 @@
 <a name="current-release"></a>
 # Version 0.1.0 (#_#_#_#_#)
 
-* [#_#_#_#_#](https://github.com/nknapp/example/commit/#_#_#_#_#) Added package.json - Nils Knappmeier
+* [#_#_#_#_#](https://github.com/nknapp/example/commit/#_#_#_#_#) Added package.json - Test User
diff --git a/test/fixtures/index-spec/CHANGELOG-second.md b/test/fixtures/index-spec/CHANGELOG-second.md
@@ -3,10 +3,10 @@
 <a name="current-release"></a>
 # Version 0.1.1 (#_#_#_#_#)
 
-* [#_#_#_#_#](https://github.com/nknapp/example/commit/#_#_#_#_#) Added index.js - Nils Knappmeier
+* [#_#_#_#_#](https://github.com/nknapp/example/commit/#_#_#_#_#) Added index.js - Test User
 
 
 
 # Version 0.1.0 (#_#_#_#_#)
 
-* [#_#_#_#_#](https://github.com/nknapp/example/commit/#_#_#_#_#) Added package.json - Nils Knappmeier
+* [#_#_#_#_#](https://github.com/nknapp/example/commit/#_#_#_#_#) Added package.json - Test User
diff --git a/test/index-spec.js b/test/index-spec.js
@@ -85,7 +85,8 @@ describe('main-module:', () => {
       .then(() => qfs.makeTree(workDir()))
       // Create git repo
       .then(() => qcp.execFile('git', ['init'], {cwd: workDir()}))
-
+      .then(() => git('config', 'user.email', 'test@example.com'))
+      .then(() => git('config', 'user.name', 'Test User'))
       // add and commit package.json
       .then(() => {
         return qfs.write(workDir('package.json'), JSON.stringify({