X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-fmt-merge-msg.perl;h=dae383f231f4fc4dd5482b2e091da5fe80cfa35d;hb=c401cb48e77459a4ccad76888ad31bef252facc5;hp=0467a387e125ab43f051cc31b4b61dca922779aa;hpb=1cb303872ab1ba73fcc52167c61fc4211c843cf5;p=git.git

diff --git a/git-fmt-merge-msg.perl b/git-fmt-merge-msg.perl
index 0467a387..dae383f2 100755
--- a/git-fmt-merge-msg.perl
+++ b/git-fmt-merge-msg.perl
@@ -28,37 +28,30 @@ sub andjoin {
 }
 
 sub repoconfig {
-	my $fh;
-	my $val;
-	eval {
-		open $fh, '-|', 'git-repo-config', '--get', 'merge.summary'
-		    or die "$!";
-		($val) = <$fh>;
-		close $fh;
-	};
+	my ($val) = qx{git-repo-config --get merge.summary};
 	return $val;
 }
 
-sub mergebase {
-	my ($other) = @_;
-	my $fh;
-	open $fh, '-|', 'git-merge-base', '--all', 'HEAD', $other or die "$!";
-	my (@mb) = map { chomp; $_ } <$fh>;
-	close $fh or die "$!";
-	return @mb;
+sub current_branch {
+	my ($bra) = qx{git-symbolic-ref HEAD};
+	chomp($bra);
+	$bra =~ s|^refs/heads/||;
+	if ($bra ne 'master') {
+		$bra = " into $bra";
+	} else {
+		$bra = "";
+	}
+	return $bra;
 }
 
 sub shortlog {
-	my ($tip, $limit, @base) = @_;
-	my ($fh, @result);
-	open $fh, '-|', ('git-log', "--max-count=$limit", '--topo-order',
-			 '--pretty=oneline', $tip, map { "^$_" } @base)
-	    or die "$!";
-	while (<$fh>) {
+	my ($tip) = @_;
+	my @result;
+	foreach ( qx{git-log --topo-order --pretty=oneline $tip ^HEAD} ) {
 		s/^[0-9a-f]{40}\s+//;
 		push @result, $_;
 	}
-	close $fh or die "$!";
+	die "git-log failed\n" if $?;
 	return @result;
 }
 
@@ -140,7 +133,10 @@ for my $src (@src) {
 	}
 	push @msg, $this;
 }
-print "Merge ", join("; ", @msg), "\n";
+
+my $into = current_branch();
+
+print "Merge ", join("; ", @msg), $into, "\n";
 
 if (!repoconfig) {
 	exit(0);
@@ -151,8 +147,7 @@ my $limit = 20;
 
 for (@origin) {
 	my ($sha1, $name) = @$_;
-	my @mb = mergebase($sha1);
-	my @log = shortlog($sha1, $limit + 1, @mb);
+	my @log = shortlog($sha1);
 	if ($limit + 1 <= @log) {
 		print "\n* $name: (" . scalar(@log) . " commits)\n";
 	}