fmt-merge-msg: say which branch things were merged into unless 'master'

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

diff --git a/git-fmt-merge-msg.perl b/git-fmt-merge-msg.perl
index 0467a387e125ab43f051cc31b4b61dca922779aa..616bb521cb2171b8e8e5066a8c022a9317e10d38 100755 (executable)
--- a/git-fmt-merge-msg.perl
+++ b/git-fmt-merge-msg.perl
@@ -39,20 +39,25 @@ sub repoconfig {
        return $val;
 }
 
        return $val;
 }
 

-sub mergebase {
-       my ($other) = @_;
+sub current_branch {

        my $fh;
        my $fh;

-       open $fh, '-|', 'git-merge-base', '--all', 'HEAD', $other or die "$!";
-       my (@mb) = map { chomp; $_ } <$fh>;
-       close $fh or die "$!";
-       return @mb;
+       open $fh, '-|', 'git-symbolic-ref', 'HEAD' or die "$!";
+       my ($bra) = <$fh>;
+       $bra =~ s|^refs/heads/||;
+       if ($bra ne 'master') {
+               $bra = " into $bra";
+       } else {
+               $bra = "";
+       }
+
+       return $bra;

 }
 
 sub shortlog {
 }
 
 sub shortlog {

-       my ($tip, $limit, @base) = @_;
+       my ($tip, $limit) = @_;

        my ($fh, @result);
        open $fh, '-|', ('git-log', "--max-count=$limit", '--topo-order',
        my ($fh, @result);
        open $fh, '-|', ('git-log', "--max-count=$limit", '--topo-order',

-                        '--pretty=oneline', $tip, map { "^$_" } @base)
+                        '--pretty=oneline', $tip, '^HEAD')

            or die "$!";
        while (<$fh>) {
                s/^[0-9a-f]{40}\s+//;
            or die "$!";
        while (<$fh>) {
                s/^[0-9a-f]{40}\s+//;


@@ -140,7 +145,10 @@ sub shortlog {
        }
        push @msg, $this;
 }
        }
        push @msg, $this;
 }

-print "Merge ", join("; ", @msg), "\n";
+
+my $into = current_branch();
+
+print "Merge ", join("; ", @msg), $into, "\n";

 
 if (!repoconfig) {
        exit(0);
 
 if (!repoconfig) {
        exit(0);


@@ -151,8 +159,7 @@ sub shortlog {
 
 for (@origin) {
        my ($sha1, $name) = @$_;
 
 for (@origin) {
        my ($sha1, $name) = @$_;

-       my @mb = mergebase($sha1);
-       my @log = shortlog($sha1, $limit + 1, @mb);
+       my @log = shortlog($sha1, $limit + 1);

        if ($limit + 1 <= @log) {
                print "\n* $name: (" . scalar(@log) . " commits)\n";
        }
        if ($limit + 1 <= @log) {
                print "\n* $name: (" . scalar(@log) . " commits)\n";
        }