Skip to content

Commit 2cb6982

Browse files
committed
release.pl: stay on same master* branch
(cherry picked from commit cc42978)
1 parent a51bebd commit 2cb6982

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

scripts/release.pl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ ($$)
207207
$newminor++;
208208

209209
print "Updating master...\n";
210-
run( "git checkout master", "checkout master failed" );
210+
run( "git checkout $branch", "checkout master failed" );
211211

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

233-
push @topush, "master";
233+
push @topush, $branch;
234234
}
235235

236236
push @topush, $relbranch;

0 commit comments

Comments
 (0)