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/12/23 14:21:40 UTC
[1/2] git commit: Use --no-merges for repo-status command
Updated Branches:
refs/heads/master 6edbde682 -> 6f8105ca6
Use --no-merges for repo-status 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/20ad7c57
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/20ad7c57
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/20ad7c57
Branch: refs/heads/master
Commit: 20ad7c574b07a5d9f5d066e17819f807956c9e82
Parents: 6edbde6
Author: Andrew Grieve <ag...@chromium.org>
Authored: Wed Dec 18 22:11:25 2013 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Wed Dec 18 22:11:25 2013 -0500
----------------------------------------------------------------------
coho | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/20ad7c57/coho
----------------------------------------------------------------------
diff --git a/coho b/coho
index d104fa2..4779f82 100755
--- a/coho
+++ b/coho
@@ -845,7 +845,7 @@ function repoStatusCommand(argv) {
return;
}
var targetBranch = branches2 ? branches2[i] : (remoteBranchExists(repo, branchName) ? repo.remoteName + '/' + branchName : 'master');
- var changes = execHelper('git log --oneline ' + targetBranch + '..' + branchName, true);
+ var changes = execHelper('git log --no-merges --oneline ' + targetBranch + '..' + branchName, true);
if (changes) {
print(repo.repoName + ' on branch ' + branchName + ' (vs ' + targetBranch + '): Commits exist.');
console.log(changes);
[2/2] git commit: Fix pull request filter of last-week command.
Posted by ag...@apache.org.
Fix pull request filter of last-week command.
It wasn't filtering out at all :(
Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/6f8105ca
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/6f8105ca
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/6f8105ca
Branch: refs/heads/master
Commit: 6f8105ca66043bdd4a98b40c0df2b47ab20f4eeb
Parents: 20ad7c5
Author: Andrew Grieve <ag...@chromium.org>
Authored: Mon Dec 23 08:21:06 2013 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Dec 23 08:21:06 2013 -0500
----------------------------------------------------------------------
coho | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/6f8105ca/coho
----------------------------------------------------------------------
diff --git a/coho b/coho
index 4779f82..87b278b 100755
--- a/coho
+++ b/coho
@@ -1377,7 +1377,7 @@ function lastWeekCommand() {
cmd = 'git log --no-merges --date=short --fixed-strings --committer="' + userEmail + '"';
forEachRepo(repos, function(repo) {
var repoName = repo.id + new Array(Math.max(0, 20 - repo.id.length + 1)).join(' ');
- var output = execHelper(cmd + ' --format="%an|' + repoName + ' %cd %s"' +
+ var output = execHelper(cmd + ' --format="%ae|' + repoName + ' %cd %s"' +
' --since="' + days + ' days ago"', true);
if (output) {
output.split('\n').forEach(function(line) {