Skip to content

Commit

Permalink
release.pl: stay on same master* branch
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Oct 21, 2016
1 parent 1fbca7e commit cc42978
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions scripts/release.pl
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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;
Expand Down

0 comments on commit cc42978

Please sign in to comment.