X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-fmt-merge-msg.perl;h=c13af4884abc9371250687cb2ab25b66a91acc48;hb=bec2a69fe4c2dbb377d2742a4def7e3569b4c1d4;hp=a77e94eb5a8933cb43c8aa0707a7a345f14e97f5;hpb=2a86ec46da99e4cd5e6e394d378ba119d8f5069d;p=git.git

diff --git a/git-fmt-merge-msg.perl b/git-fmt-merge-msg.perl
index a77e94eb..c13af488 100755
--- a/git-fmt-merge-msg.perl
+++ b/git-fmt-merge-msg.perl
@@ -60,12 +60,12 @@ sub current_branch {
 }
 
 sub shortlog {
-	my ($tip, $limit) = @_;
+	my ($tip) = @_;
 	my ($fh, @result);
 	my $pid = open($fh, '-|');
 	die "$!" unless defined $pid;
 	if (!$pid) {
-	    exec('git-log', "--max-count=$limit", '--topo-order',
+	    exec('git-log', '--topo-order',
 		 '--pretty=oneline', $tip, '^HEAD') or die "$!";
 	}
 	while (<$fh>) {
@@ -168,7 +168,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";
 	}