Merge branch 'jc/nostat'

[git.git] / git-fmt-merge-msg.perl

diff --git a/git-fmt-merge-msg.perl b/git-fmt-merge-msg.perl
index 616bb52..3de67d7 100755 (executable)
--- a/git-fmt-merge-msg.perl
+++ b/git-fmt-merge-msg.perl
@@ -43,6 +43,7 @@ sub current_branch {
        my $fh;
        open $fh, '-|', 'git-symbolic-ref', 'HEAD' or die "$!";
        my ($bra) = <$fh>;
+       chomp($bra);
        $bra =~ s|^refs/heads/||;
        if ($bra ne 'master') {
                $bra = " into $bra";
@@ -54,9 +55,9 @@ sub current_branch {
 }
 
 sub shortlog {
-       my ($tip, $limit) = @_;
+       my ($tip) = @_;
        my ($fh, @result);
-       open $fh, '-|', ('git-log', "--max-count=$limit", '--topo-order',
+       open $fh, '-|', ('git-log', '--topo-order',
                         '--pretty=oneline', $tip, '^HEAD')
            or die "$!";
        while (<$fh>) {
@@ -159,7 +160,7 @@ my $limit = 20;
 
 for (@origin) {
        my ($sha1, $name) = @$_;
-       my @log = shortlog($sha1, $limit + 1);
+       my @log = shortlog($sha1);
        if ($limit + 1 <= @log) {
                print "\n* $name: (" . scalar(@log) . " commits)\n";
        }