Repository: cordova-coho Updated Branches: refs/heads/master 9691db78c -> ef455c7ee
Added back stash logic for --pull-only, added flag to docs. Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/ef455c7e Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/ef455c7e Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/ef455c7e Branch: refs/heads/master Commit: ef455c7eebd924e98f6934f910263e18cd609a3f Parents: 9691db7 Author: Shazron Abdullah <shaz...@gmail.com> Authored: Thu Aug 10 16:53:34 2017 -0700 Committer: Shazron Abdullah <shaz...@gmail.com> Committed: Thu Aug 10 16:53:34 2017 -0700 ---------------------------------------------------------------------- src/merge-pr.js | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/ef455c7e/src/merge-pr.js ---------------------------------------------------------------------- diff --git a/src/merge-pr.js b/src/merge-pr.js index 81a31a2..8e8fed4 100644 --- a/src/merge-pr.js +++ b/src/merge-pr.js @@ -42,7 +42,9 @@ module.exports = function *(argv) { ' * Perform a rebase of the `pr/pr#` branch. \n' + ' * Attempt a `--ff-only` merge to master. \n' + ' * On success, it will modify the last commit\'s message to include. `This closes #pr` to ensure the corresponding PR closes on pushing to remote. \n\n' + - 'Usage: $0 merge-pr --pr 111') + 'Usage: $0 merge-pr --pr 111' + + '(optional) --pull-only Pulls the change into a branch only, and checks it out. Does not merge it to the master branch.' + ) .argv; if (argv.h) { optimist.showHelp(); @@ -105,16 +107,11 @@ module.exports = function *(argv) { } else { console.log(chalk.red.bold('Nothing to merge - Has this already been merged?')); } - - } else { - // git checkout localbranch - yield executil.execHelper(executil.ARGS('git checkout ' + localBranch)); } } - if (!pull_only) { - yield gitutil.stashAndPop('', mergePr); - } else { - yield mergePr(); + yield gitutil.stashAndPop('', mergePr); + if (pull_only) { + yield executil.execHelper(executil.ARGS('git checkout ' + localBranch)); } }; \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
