@matheusbsbs / matheus-bagliano / commits / d37a1ed7f2
Fork 0

Fix fmt-merge-msg counting.

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

Junio C Hamano committed Feb 20, 2006 at 19:26 UTC d37a1ed7f2993a3cb8da0dd0fbcf993ba6579c82
1 file changed +3 -3
git-fmt-merge-msg.perl
+3 -3
@@ -55,9 +55,9 @@ sub current_branch {
55 }
56
57 sub shortlog {
58 - my ($tip, $limit) = @_;
58 + my ($tip) = @_;
59 my ($fh, @result);
60 - open $fh, '-|', ('git-log', "--max-count=$limit", '--topo-order',
60 + open $fh, '-|', ('git-log', '--topo-order',
61 '--pretty=oneline', $tip, '^HEAD')
62 or die "$!";
63 while (<$fh>) {
@@ -160,7 +160,7 @@ my $limit = 20;
160
161 for (@origin) {
162 my ($sha1, $name) = @$_;
163 - my @log = shortlog($sha1, $limit + 1);
163 + my @log = shortlog($sha1);
164 if ($limit + 1 <= @log) {
165 print "\n* $name: (" . scalar(@log) . " commits)\n";
166 }