[Bps-public-commit] smokingit branch, master, updated. 01f6dcfa6b1502772b1ae6971af44087350815c6

[Alex Vandiver]

The branch, master has been updated
       via  01f6dcfa6b1502772b1ae6971af44087350815c6 (commit)
      from  08ea5222e5fb91e9801276e59ff6a252bc836644 (commit)

Summary of changes:
 lib/Smokingit/Model/Project.pm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 01f6dcfa6b1502772b1ae6971af44087350815c6
Author: Alex Vandiver <alex at chmrr.net>
Date:   Mon Jan 31 13:30:38 2011 -0500

    Only test commits which _no_ branch has covered
    
    If a merge pulls in a branch whose tip is tested, but which also pulls
    in earlier, untested commits, trust the tip's status, and skip testing
    all of those earlier untested commits which it also pulls in.  We do
    this by excluding _all_ tested commit shas, not just the current
    branch's.

diff --git a/lib/Smokingit/Model/Project.pm b/lib/Smokingit/Model/Project.pm
index 7d08d61..98d2b72 100644
--- a/lib/Smokingit/Model/Project.pm
+++ b/lib/Smokingit/Model/Project.pm
@@ -192,8 +192,8 @@ sub schedule_tests {
         }
 
         # Go looking for other commits to run
-        my @filter = (      $branch->current_commit->sha,
-                      "^" . $branch->tested_commit->sha);
+        my @filter = (    $branch->current_commit->sha,
+                       map {"^".$_->tested_commit->sha} @branches );
 
         my @shas = map {$self->sha($_)} split /\n/, `git rev-list --reverse @filter`;
 

-----------------------------------------------------------------------