Fix fmt-merge-msg counting.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-fmt-merge-msg.perl b/git-fmt-merge-msg.perl
index c34ddc5d5ec1b14ceb80fd699ad6b7c96e3f6b4c..3de67d779044ca0a9a511eded6929b3c33ddcd1f 100755 (executable)
--- a/git-fmt-merge-msg.perl
+++ b/git-fmt-merge-msg.perl
@@ -55,9 +55,9 @@ sub current_branch {
 }
 
 sub shortlog {
 }
 
 sub shortlog {

-       my ($tip, $limit) = @_;
+       my ($tip) = @_;

        my ($fh, @result);
        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>) {
                         '--pretty=oneline', $tip, '^HEAD')
            or die "$!";
        while (<$fh>) {


@@ -160,7 +160,7 @@ sub shortlog {
 
 for (@origin) {
        my ($sha1, $name) = @$_;
 
 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";
        }
        if ($limit + 1 <= @log) {
                print "\n* $name: (" . scalar(@log) . " commits)\n";
        }