From: Junio C Hamano <junkio@cox.net>
Date: Tue, 21 Feb 2006 09:07:57 +0000 (-0800)
Subject: Merge branch 'pj/portable' into next
X-Git-Tag: v1.3.0-rc1~54^2~49
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=deddce6f7b27108ff71ed5a3362faa721cb612a0;p=git.git

Merge branch 'pj/portable' into next

* pj/portable:
  Makefile tweaks: Solaris 9+ dont need iconv / move up uname variables
  Merge part of jc/portable branch
  git-mktree: reverse of git-ls-tree.
  Merge branch 'lt/merge-tree'
  Merge branch 'jc/ident'
  cherry-pick/revert: error-help message rewording.
  Fix fmt-merge-msg counting.
---

deddce6f7b27108ff71ed5a3362faa721cb612a0
diff --cc git-fmt-merge-msg.perl
index a77e94eb5,3de67d779..c13af4884
--- a/git-fmt-merge-msg.perl
+++ b/git-fmt-merge-msg.perl
@@@ -60,14 -55,11 +60,14 @@@ sub current_branch 
  }
  
  sub shortlog {
- 	my ($tip, $limit) = @_;
+ 	my ($tip) = @_;
  	my ($fh, @result);
 -	open $fh, '-|', ('git-log', '--topo-order',
 -			 '--pretty=oneline', $tip, '^HEAD')
 -	    or die "$!";
 +	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>) {
  		s/^[0-9a-f]{40}\s+//;
  		push @result, $_;