projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Revert "diff-delta: produce optimal pack data""
[git.git]
/
git-fmt-merge-msg.perl
diff --git
a/git-fmt-merge-msg.perl
b/git-fmt-merge-msg.perl
index
a77e94e
..
c13af48
100755
(executable)
--- a/
git-fmt-merge-msg.perl
+++ b/
git-fmt-merge-msg.perl
@@
-60,12
+60,12
@@
sub current_branch {
}
sub shortlog {
}
sub shortlog {
- my ($tip
, $limit
) = @_;
+ my ($tip) = @_;
my ($fh, @result);
my $pid = open($fh, '-|');
die "$!" unless defined $pid;
if (!$pid) {
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>) {
'--pretty=oneline', $tip, '^HEAD') or die "$!";
}
while (<$fh>) {
@@
-168,7
+168,7
@@
my $limit = 20;
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";
}