Skip to content
Permalink
Browse files

release.pl: stay on same master* branch

(cherry picked from commit cc42978)
  • Loading branch information
jef-n committed Oct 22, 2016
1 parent a51bebd commit 2cb69821137f493f944f1eaafb38452ca426d445
Showing with 2 additions and 2 deletions.
  1. +2 −2 scripts/release.pl
@@ -207,7 +207,7 @@ ($$)
$newminor++;

print "Updating master...\n";
run( "git checkout master", "checkout master failed" );
run( "git checkout $branch", "checkout master failed" );

if($dopremajor) {
print " Creating master_$newmajor...\n";
@@ -230,7 +230,7 @@ ($$)
run( "dch --newversion $newmajor.$newminor.0 'New development version $newmajor.$newminor after branch of $release'", "dch failed" );
run( "git commit -a -m 'Bump version to $newmajor.$newminor'", "bump version failed" );

push @topush, "master";
push @topush, $branch;
}

push @topush, $relbranch;

0 comments on commit 2cb6982

Please sign in to comment.
You can’t perform that action at this time.