diff options
author | Henrik Nord <[email protected]> | 2011-10-10 11:54:47 +0200 |
---|---|---|
committer | Henrik Nord <[email protected]> | 2011-10-10 11:54:47 +0200 |
commit | c27e0b0cc5989eba84ca223e3c0ce4bc25b7a86e (patch) | |
tree | 82f6f8cab11f115d90e10c1a94451dbca3b8d055 | |
parent | 1c61415fa73c0c69022e5a943044a5df516cebf9 (diff) | |
download | otp-c27e0b0cc5989eba84ca223e3c0ce4bc25b7a86e.tar.gz otp-c27e0b0cc5989eba84ca223e3c0ce4bc25b7a86e.tar.bz2 otp-c27e0b0cc5989eba84ca223e3c0ce4bc25b7a86e.zip |
Update scripts to reflect branch changes
-rwxr-xr-x | cook | 10 | ||||
-rwxr-xr-x | page | 2 |
2 files changed, 6 insertions, 6 deletions
@@ -36,12 +36,12 @@ print "From: $from\n" print "Date: $header_date\n"; print "To: erlang patches <erlang-patches\@erlang.org>\n"; print "Subject: $title\n"; -print "X-dev-at: ", `git rev-parse dev`; +print "X-dev-at: ", `git rev-parse master`; my %cooking; my %stalled; my $current; -my $prev_dev = 'master'; +my $prev_dev = '`git describe master`'; if (@ARGV) { my $state = 'header'; while (<>) { @@ -95,7 +95,7 @@ map { s/^\s*// } @old_in_dev; @old_in_dev = grep { m@^[^/]{2,4}/[^/]*@ } @old_in_dev; my %old_in_dev = map { $_ => 1 } @old_in_dev; -my @in_dev = `git branch --merged dev`; +my @in_dev = `git branch --merged master`; chomp @in_dev; map { s/^\s*// } @in_dev; @in_dev = grep { m@^[^/]{2,4}/[^/]*@ && !exists $old_in_dev{$_} } @in_dev; @@ -117,7 +117,7 @@ map { s@^refs/heads/@@ } @dropped; !exists $in_pu{$_} } @dropped; my %child; -foreach (`git rev-list --no-merges --children master..dev`) { +foreach (`git rev-list --no-merges --children $prev_dev..pu`) { chomp; my($ref,$child) = split ' '; $child{$ref} = $child; @@ -165,7 +165,7 @@ sub header { sub describe { my($marker,$topic,$text) = @_; - print_commits($topic, "dev..$topic", $marker); + print_commits($topic, "master..$topic", $marker); $text =~ s/\n*$//g; print "\n$text\n" if $text ne ''; print "\n"; @@ -56,7 +56,7 @@ the topic branch has been updated. END my $root_url = "https://github.com/erlang/otp/commit"; -foreach (`git log --oneline --first-parent dev..pu`) { +foreach (`git log --oneline --first-parent master..pu`) { if (/^([\da-f]*) Merge branch '([^\']*)'/) { my($child,$topic) = ($1,$2); my $range = "$child^1..$child^2"; |