146
146
print " Pulling transifex translations...\n " ;
147
147
run( " scripts/pull_ts.sh" , " pull_ts.sh failed" );
148
148
run( " git add i18n/*.ts" , " adding translations failed" );
149
- run( " git commit -a -m \" translation update for $release from transifex\" " , " could not commit translation updates" );
149
+ run( " git commit -n - a -m \" translation update for $release from transifex\" " , " could not commit translation updates" );
150
150
}
151
151
152
152
print " Updating changelog...\n " ;
155
155
unless ( $dopoint ) {
156
156
run( " scripts/update-news.pl $newmajor $newminor '$release '" , " could not update news" ) if $major >2 || ($major ==2 && $minor >14);
157
157
158
- run( " git commit -a -m \" changelog and news update for $release \" " , " could not commit changelog and news update" );
158
+ run( " git commit -n - a -m \" changelog and news update for $release \" " , " could not commit changelog and news update" );
159
159
160
160
print " Creating and checking out branch...\n " ;
161
161
run( " git checkout -b $relbranch " , " git checkout release branch failed" );
@@ -178,11 +178,11 @@ ($$)
178
178
print " WARNING: NO images/splash/splash-release.xcf.bz2\n " ;
179
179
}
180
180
181
- run( " git commit -a -m 'Release of $release ($newreleasename )'" , " release commit failed" );
181
+ run( " git commit -n - a -m 'Release of $release ($newreleasename )'" , " release commit failed" );
182
182
run( " git tag $reltag -m 'Version $release '" , " release tag failed" );
183
183
run( " git tag $ltrtag -m 'Long term release $release '" , " ltr tag failed" ) if $doltr ;
184
184
} else {
185
- run( " git commit -a -m 'Release of $version '" , " release commit failed" );
185
+ run( " git commit -n - a -m 'Release of $version '" , " release commit failed" );
186
186
run( " git tag $reltag -m 'Version $version '" , " tag failed" );
187
187
}
188
188
@@ -195,18 +195,19 @@ ($$)
195
195
196
196
print " Updating master...\n " ;
197
197
run( " git checkout master" , " checkout master failed" );
198
+
198
199
updateCMakeLists($newmajor ,$newminor ,0," Master" );
199
200
run( " cp /tmp/changelog debian" , " restore changelog failed" );
200
201
run( " dch -r ''" , " dch failed" );
201
202
run( " dch --newversion $newmajor .$newminor .0 'New development version $newmajor .$newminor after branch of $release '" , " dch failed" );
202
- run( " git commit -a -m 'Bump version to $newmajor .$newminor '" , " bump version failed" );
203
+ run( " git commit -n - a -m 'Bump version to $newmajor .$newminor '" , " bump version failed" );
203
204
}
204
205
205
206
my $topush = ($dopoint ? " " : " master " ) . " $relbranch " ;
206
207
207
208
print " Push dry-run...\n " ;
208
209
run( " git push -n --follow-tags origin $topush " , " push dry run failed" );
209
- print " Now manually push and upload the tarballs :\n\t git push --follow-tags origin $topush \n\t rsync qgis-$version .tar.bz2* qgis.org:/var/www/downloads/\n\n " ;
210
+ print " Now manually push and upload the tarballs :\n\t git push --follow-tags origin $topush \n\t rsync qgis-$version .tar.bz2* ssh. qgis.org:/var/www/downloads/\n\n " ;
210
211
211
212
212
213
=head1 NAME
0 commit comments