You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ni...@apache.org on 2015/05/21 19:39:42 UTC
cordova-coho git commit: Fix a small bug in merge-pr command
Repository: cordova-coho
Updated Branches:
refs/heads/master e337cabca -> 075403685
Fix a small bug in merge-pr command
Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/07540368
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/07540368
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/07540368
Branch: refs/heads/master
Commit: 075403685f55bd67a00427712b3bf95c91c9cbc0
Parents: e337cab
Author: Nikhil Khandelwal <ni...@microsoft.com>
Authored: Thu May 21 10:39:24 2015 -0700
Committer: Nikhil Khandelwal <ni...@microsoft.com>
Committed: Thu May 21 10:39:24 2015 -0700
----------------------------------------------------------------------
src/merge-pr.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/07540368/src/merge-pr.js
----------------------------------------------------------------------
diff --git a/src/merge-pr.js b/src/merge-pr.js
index 0f0c76d..0239d29 100644
--- a/src/merge-pr.js
+++ b/src/merge-pr.js
@@ -62,7 +62,7 @@ module.exports = function *(argv) {
if (e.message.indexOf('fatal: Not possible to fast-forward, aborting.') > 0) {
// Let's try to rebase
yield executil.execHelper(executil.ARGS('git checkout ' + localBranch));
- yield executil.execHelper('git', 'pull', '--rebase', origin, 'master');
+ yield executil.execHelper(['git', 'pull', '--rebase', origin, 'master']);
yield executil.execHelper(executil.ARGS('git checkout master'));
yield executil.execHelper(executil.ARGS('git merge --ff-only ' + localBranch));
var commitMessage = yield executil.execHelper(executil.ARGS('git log --format=%B -n 1 HEAD'), /*silent*/ true);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org