summaryrefslogtreecommitdiff
path: root/git-fmt-merge-msg.perl
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-21 03:26:21 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-21 03:26:21 (GMT)
commitd37a1ed7f2993a3cb8da0dd0fbcf993ba6579c82 (patch)
tree6bb99d0569ed30db487a69d9b84de2672efcb5cc /git-fmt-merge-msg.perl
parent551ce28fe1f2777eee7dd9c02bd44f55f4b32361 (diff)
downloadgit-d37a1ed7f2993a3cb8da0dd0fbcf993ba6579c82.zip
git-d37a1ed7f2993a3cb8da0dd0fbcf993ba6579c82.tar.gz
git-d37a1ed7f2993a3cb8da0dd0fbcf993ba6579c82.tar.bz2
Fix fmt-merge-msg counting.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-fmt-merge-msg.perl')
-rwxr-xr-xgit-fmt-merge-msg.perl6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-fmt-merge-msg.perl b/git-fmt-merge-msg.perl
index c34ddc5..3de67d7 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";
}