diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-07-18 12:43:39 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-07-18 12:43:39 -0400 |
| commit | bb105ef1f604720f50466d0b375a73c3927dd010 (patch) | |
| tree | a20bab290340541a686bb8e221555c73b8434369 | |
| parent | be5aa47b55f8a140cc69f34214fb36a187cca46a (diff) | |
| download | tor-bb105ef1f604720f50466d0b375a73c3927dd010.tar.gz tor-bb105ef1f604720f50466d0b375a73c3927dd010.zip | |
Enhance findMergedChanges to allow looking at non-release targets
| -rwxr-xr-x | contrib/findMergedChanges.pl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/contrib/findMergedChanges.pl b/contrib/findMergedChanges.pl index 460424f309..46e070f943 100755 --- a/contrib/findMergedChanges.pl +++ b/contrib/findMergedChanges.pl @@ -36,18 +36,22 @@ Suggested application: EOF } +my $target_branch = "origin/release-0.2.2"; + while (@ARGV and $ARGV[0] =~ /^--/) { my $flag = shift @ARGV; if ($flag =~ /^--(weird|merged|unmerged|list)/) { $look_for_type = $1; + } elsif ($flag =~ /^--branch=(\S+)/) { + $target_branch = $1; } else { die "Unrecognized flag $flag"; } } for my $changefile (@ARGV) { - my $n_merged = nChanges("origin/release-0.2.2", $changefile); - my $n_postmerged = nChanges("origin/release-0.2.2..origin/master", $changefile); + my $n_merged = nChanges($target_branch, $changefile); + my $n_postmerged = nChanges("${target_branch}..origin/master", $changefile); my $type; if ($n_merged != 0 and $n_postmerged == 0) { |