From d37a1ed7f2993a3cb8da0dd0fbcf993ba6579c82 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 20 Feb 2006 19:26:21 -0800 Subject: [PATCH 1/1] Fix fmt-merge-msg counting. Signed-off-by: Junio C Hamano --- git-fmt-merge-msg.perl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git-fmt-merge-msg.perl b/git-fmt-merge-msg.perl index c34ddc5d..3de67d77 100755 --- a/git-fmt-merge-msg.perl +++ b/git-fmt-merge-msg.perl @@ -55,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>) { @@ -160,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"; } -- 2.11.0