fix: git push with upstream specified (#206)

packages/shipjs/src/flow/prepare.js

@@ -6,7 +6,7 @@ import checkHub from '../step/checkHub';
 import validate from '../step/prepare/validate';
 import validateMergeStrategy from '../step/prepare/validateMergeStrategy';
 import pull from '../step/pull';
-import push from '../step/push';
+import push from '../step/prepare/push';
 import getNextVersion from '../step/prepare/getNextVersion';
 import confirmNextVersion from '../step/prepare/confirmNextVersion';
 import prepareStagingBranch from '../step/prepare/prepareStagingBranch';
@@ -40,7 +40,7 @@ async function prepare({
   const { currentVersion, baseBranch } = validate({ config, dir });
   validateMergeStrategy({ config });
   pull({ dir, dryRun });
-  push({ dir, dryRun });
+  push({ config, currentBranch: baseBranch, dir, dryRun });
   let { nextVersion } = getNextVersion({ dir });
   nextVersion = await confirmNextVersion({
     yes,

packages/shipjs/src/step/prepare/push.js

@@ -0,0 +1,7 @@
+import runStep from '../runStep';
+
+export default ({ config, currentBranch, dir, dryRun }) =>
+  runStep({ title: 'Pushing to remote.' }, ({ run }) => {
+    const { remote } = config;
+    run(`git push ${remote} ${currentBranch}`, dir, dryRun);
+  });

packages/shipjs/src/step/release/gitPush.js

@@ -14,9 +14,9 @@ export default ({ tagName, config, dir, dryRun }) =>
     if (currentBranch === destinationBranch) {
       run(pushCommand, dir, dryRun);
     } else {
-      // currentBranch: 'release/legacy'
-      // destinationBranch: 'legacy'
-      // flow: legacy -> release/legacy -> (here) legacy
+      // currentBranch: 'master'
+      // destinationBranch: 'develop'
+      // flow: develop -> master -> (here) develop
       run(`git checkout ${destinationBranch}`, dir, dryRun);
       run(`git merge ${currentBranch}`, dir, dryRun);
       run(pushCommand, dir, dryRun);