@@ -83,6 +83,9 @@ sub branches {

   my $start;

   my $no_merged_branches_h;

   while (my $branch_name = $self->_dec(scalar <$fh>)) {

+    $branch_name =~ s/^\*//;

+    $branch_name =~ s/^\s*//;

+    $branch_name =~ s/\s*$//;

     # No merged branch

     $no_merged_branches_h = $self->no_merged_branch_h($user, $project)

@@ -95,6 +98,7 @@ sub branches {

   }

   @$branches = sort { $a->{commit}{age} <=> $b->{commit}{age} } @$branches;

+  

   return $branches;

 }

@@ -334,4 +334,18 @@ note 'README';

   $t->content_like(qr#<a href="http://foo3">http://foo3</a>#);

   $t->content_like(qr#<a href="http://foo4">http://foo4</a>#);

   $t->content_like(qr#<a href="http://foo5">http://foo5</a>#);

+}

+

+note 'Branches';

+{

+  # Page access

+  $t->get_ok("/$user/$project/branches");

+  $t->content_like(qr/Branches/);

+  

+  # No merged branch

+  $t->content_like(qr/no-merged-branch.*?no_merged/s);

+  

+  # Marged branch

+  $t->content_like(qr/"merged-branch.*?b2/s);

+  

 }