Merge branch 'rr/rebase-autostash'

diff --git a/contrib/contacts/git-contacts b/contrib/contacts/git-contacts
index 1686ff340ad0dbc7eff53411107858a08f4024b9..d80f7d1b6e6928dc7d24a56720caf13220f95236 100755 (executable)
--- a/contrib/contacts/git-contacts
+++ b/contrib/contacts/git-contacts
@@ -102,9 +102,26 @@ sub scan_patch_file {
        close $f;
 }
 
+sub parse_rev_args {
+       my @args = @_;
+       open my $f, '-|',
+               qw(git rev-parse --revs-only --default HEAD --symbolic), @args
+               or die;
+       my @revs;
+       while (<$f>) {
+               chomp;
+               push @revs, $_;
+       }
+       close $f;
+       return @revs if scalar(@revs) != 1;
+       return "^$revs[0]", 'HEAD' unless $revs[0] =~ /^-/;
+       return $revs[0], 'HEAD';
+}
+
 sub scan_rev_args {
        my ($commits, $args) = @_;
-       open my $f, '-|', qw(git rev-list --reverse), @$args or die;
+       my @revs = parse_rev_args(@$args);
+       open my $f, '-|', qw(git rev-list --reverse), @revs or die;
        while (<$f>) {
                chomp;
                my $id = $_;
@@ -116,6 +133,23 @@ sub scan_rev_args {
        close $f;
 }
 
+sub mailmap_contacts {
+       my ($contacts) = @_;
+       my %mapped;
+       my $pid = open2 my $reader, my $writer, qw(git check-mailmap --stdin);
+       for my $contact (keys(%$contacts)) {
+               print $writer "$contact\n";
+               my $canonical = <$reader>;
+               chomp $canonical;
+               $mapped{$canonical} += $contacts->{$contact};
+       }
+       close $reader;
+       close $writer;
+       waitpid($pid, 0);
+       die "git-check-mailmap error: $?\n" if $?;
+       return \%mapped;
+}
+
 if (!@ARGV) {
        die "No input revisions or patch files\n";
 }
@@ -144,6 +178,7 @@ for my $commit (values %commits) {
                $contacts->{$contact}++;
        }
 }
+$contacts = mailmap_contacts($contacts);
 
 my $ncommits = scalar(keys %commits);
 for my $contact (keys %$contacts) {