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 2013/06/28 16:58:14 UTC

git commit: Fix repo-update failing silently when branches don't exist

Updated Branches:
  refs/heads/master 7a3b9498c -> 70b5faff2


Fix repo-update failing silently when branches don't exist


Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/70b5faff
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/70b5faff
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/70b5faff

Branch: refs/heads/master
Commit: 70b5faff207e9dbc43dd5f3dd570400637da9f76
Parents: 7a3b949
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Jun 28 10:57:28 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Jun 28 10:57:55 2013 -0400

----------------------------------------------------------------------
 coho | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/70b5faff/coho
----------------------------------------------------------------------
diff --git a/coho b/coho
index beb40cf..8a992c5 100755
--- a/coho
+++ b/coho
@@ -339,6 +339,8 @@ function logCwd() {
 }
 
 function execHelper(cmd, silent, allowError) {
+    // Don't allow failure if being silent.
+    allowError = allowError || silent;
     if (/^git commit/.exec(cmd)) {
         gitCommitCount++;
     }
@@ -893,7 +895,7 @@ function updateRepos(repos, branches, noFetch) {
                 if (!remoteBranchExists(repo, branchName)) {
                     return false;
                 }
-                var changes = execHelper('git log --oneline ' + branchName + '..' + repo.remoteName + '/' + branchName, true);
+                var changes = execHelper('git log --oneline ' + branchName + '..' + repo.remoteName + '/' + branchName, true, true);
                 return !!changes;
             });
             if (!staleBranches.length) {