You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/03/28 21:15:10 UTC
[1/2] git commit: Fix crash in list-pulls when repo is null
Repository: cordova-coho
Updated Branches:
refs/heads/master 89373b321 -> 6877917af
Fix crash in list-pulls when repo is null
Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/b397e605
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/b397e605
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/b397e605
Branch: refs/heads/master
Commit: b397e6058e4daf28d88a14568828445dde9e1bcf
Parents: 89373b3
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Mar 28 16:14:38 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Mar 28 16:14:38 2014 -0400
----------------------------------------------------------------------
coho | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/b397e605/coho
----------------------------------------------------------------------
diff --git a/coho b/coho
index 89eb2f8..c9651cc 100755
--- a/coho
+++ b/coho
@@ -1948,7 +1948,11 @@ function listGitHubPullRequests(repo, maxAge, hideUser, callback) {
console.log('\x1B[33m-----------------------------------------------------------------------------------------------\x1B[39m');
console.log('* ' + pullRequest.html_url);
// console.log('To merge: curl "' + pullRequest.patch_url + '" | git am');
- console.log('To merge: git pull ' + pullRequest.head.repo.clone_url + ' ' + pullRequest.head.ref);
+ if (!pullRequest.head.repo) {
+ console.log('NO REPO EXISTS!');
+ } else {
+ console.log('To merge: git pull ' + pullRequest.head.repo.clone_url + ' ' + pullRequest.head.ref);
+ }
if (pullRequest.body) {
console.log(pullRequest.body);
}
[2/2] git commit: Fix double-printing when ulimit fix is applied
Posted by ag...@apache.org.
Fix double-printing when ulimit fix is applied
Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/6877917a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/6877917a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/6877917a
Branch: refs/heads/master
Commit: 6877917afe0a4913bdd1e1d1bbe2757009e09c1e
Parents: b397e60
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Mar 28 16:14:54 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Mar 28 16:14:54 2014 -0400
----------------------------------------------------------------------
coho | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/6877917a/coho
----------------------------------------------------------------------
diff --git a/coho b/coho
index c9651cc..b648b4c 100755
--- a/coho
+++ b/coho
@@ -20,6 +20,7 @@ under the License.
var fs = require('fs');
var path = require('path');
+var child_process = require('child_process');
try {
var optimist = require('optimist');
var shjs = require('shelljs');
@@ -2114,7 +2115,7 @@ function main() {
var ulimit = execHelper('ulimit -S -n', true, true);
if (ulimit && ulimit < 2000) {
// re-run with the new ulimit, hide the ulimit command but don't hide the output, don't allow failure
- execHelper('/bin/bash -c \'ulimit -S -n 4096; exec "' + process.argv[0] + '" "' + process.argv.slice(1).join('" "') + '"\'', 2, false);
+ child_process.spawn('/bin/bash', ['-c', 'ulimit -S -n 4096; exec "' + process.argv[0] + '" "' + process.argv.slice(1).join('" "') + '"'], {stdio:'inherit'});
return;
}