]> git.ipfire.org Git - thirdparty/git.git/commitdiff
candidates: some topics have capital letters in their names
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 23:35:41 +0000 (15:35 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 23:35:41 +0000 (15:35 -0800)
candidates

index 549e632b337be216667719d8bd04ffe7b0f985b3..449041aed85fa4b2bcb4101ef34c1fc880b35dc8 100755 (executable)
@@ -15,29 +15,33 @@ sub merged {
        return $count;
 }
 
-my ($topic, $topic_date);
+my ($topic, $topic_date, $last);
 my (@candidate);
 
 while (<>) {
-       if (/^\* ([a-z][a-z]\/[-a-z0-9_]+) \(([-0-9]{10})\) \d+ commit/) {
-               $topic = $1;
+       if (/^\* ([a-z][a-z]\/[-a-zA-Z0-9_]+) \(([-0-9]{10})\) \d+ commit/) {
+               $topic = $last = $1;
                $topic_date = $2;
                next;
        }
        if (defined $topic) {
                if (/^  \(merged to 'next' on ([-0-9]{10}) at/) {
-                       push @candidate, [$topic, $1, $topic_date];
+                       push @candidate, [$topic, $1, $topic_date, ""];
                        next;
                }
                $topic = undef;
                $topic_date = undef;
        }
+       if (defined $last && @candidate && $candidate[-1][0] eq $last) {
+               if (/Will merge to 'master'/i) {
+                       $candidate[-1][3] = "*";
+               }
+       }
 }
 
 for $topic (sort { ($a->[1] cmp $b->[1]) || ($a->[2] cmp $b->[2]) } @candidate) {
        my $count = merged($topic->[0], 'master');
        if ($count) {
-               print "$topic->[1] $topic->[2] ($count) $topic->[0]\n";
+               print "$topic->[1] $topic->[2] ($count) $topic->[3]$topic->[0]\n";
        }
 }
-