[Bps-public-commit] smokingit branch, slack, updated. 63c63f2038662377ce741d1dc044bea822240ade

[Alex Vandiver]

The branch, slack has been updated
       via  63c63f2038662377ce741d1dc044bea822240ade (commit)
      from  be9121c77f6d69704af0f1cf89315c911833c12d (commit)

Summary of changes:
 lib/Smokingit/Slack.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit 63c63f2038662377ce741d1dc044bea822240ade
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Jan 9 14:39:38 2015 -0500

    Add back a ->describe_commit lost in 92ecb92

diff --git a/lib/Smokingit/Slack.pm b/lib/Smokingit/Slack.pm
index 159bc73..d16603b 100644
--- a/lib/Smokingit/Slack.pm
+++ b/lib/Smokingit/Slack.pm
@@ -578,7 +578,8 @@ sub do_analyze {
         my $branch_good = $branch_commit->status eq "passing";
 
         if ($trunk_good and $branch_good) {
-            return "$author merged $mergename into $branchname, which is $commit" .
+            return "$author merged $mergename into $branchname, which is ".
+                $self->describe_fail($commit).
                 ", although both parents were passing - $url";
         } elsif ($trunk_good and not $branch_good) {
             return "$author merged $mergename (".

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