release.pl: bypass pre-commit hooks

qgis · Feb 24, 2017 · f60e917 · f60e917
1 parent d9f9c9d
commit f60e917
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/scripts/release.pl b/scripts/release.pl
@@ -146,7 +146,7 @@ ($$)
 	print "Pulling transifex translations...\n";
 	run( "scripts/pull_ts.sh", "pull_ts.sh failed" );
 	run( "git add i18n/*.ts", "adding translations failed" );
-	run( "git commit -a -m \"translation update for $release from transifex\"", "could not commit translation updates" );
+	run( "git commit -n -a -m \"translation update for $release from transifex\"", "could not commit translation updates" );
 }
 
 print "Updating changelog...\n";
@@ -155,7 +155,7 @@ ($$)
 unless( $dopoint ) {
 	run( "scripts/update-news.pl $newmajor $newminor '$release'", "could not update news" ) if $major>2 || ($major==2 && $minor>14);
 
-	run( "git commit -a -m \"changelog and news update for $release\"", "could not commit changelog and news update" );
+	run( "git commit -n -a -m \"changelog and news update for $release\"", "could not commit changelog and news update" );
 
 	print "Creating and checking out branch...\n";
 	run( "git checkout -b $relbranch", "git checkout release branch failed" );
@@ -178,11 +178,11 @@ ($$)
 		print "WARNING: NO images/splash/splash-release.xcf.bz2\n";
 	}
 
-	run( "git commit -a -m 'Release of $release ($newreleasename)'", "release commit failed" );
+	run( "git commit -n -a -m 'Release of $release ($newreleasename)'", "release commit failed" );
 	run( "git tag $reltag -m 'Version $release'", "release tag failed" );
 	run( "git tag $ltrtag -m 'Long term release $release'", "ltr tag failed" ) if $doltr;
 } else {
-	run( "git commit -a -m 'Release of $version'", "release commit failed" );
+	run( "git commit -n -a -m 'Release of $version'", "release commit failed" );
 	run( "git tag $reltag -m 'Version $version'", "tag failed" );
 }
 
@@ -195,18 +195,19 @@ ($$)
 
 	print "Updating master...\n";
 	run( "git checkout master", "checkout master failed" );
+
 	updateCMakeLists($newmajor,$newminor,0,"Master");
 	run( "cp /tmp/changelog debian", "restore changelog failed" );
 	run( "dch -r ''", "dch failed" );
 	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" );
+	run( "git commit -n -a -m 'Bump version to $newmajor.$newminor'", "bump version failed" );
 }
 
 my $topush = ($dopoint ? "" : "master ") . "$relbranch";
 
 print "Push dry-run...\n";
 run( "git push -n --follow-tags origin $topush", "push dry run failed" );
-print "Now manually push and upload the tarballs :\n\tgit push --follow-tags origin $topush\n\trsync qgis-$version.tar.bz2* qgis.org:/var/www/downloads/\n\n";
+print "Now manually push and upload the tarballs :\n\tgit push --follow-tags origin $topush\n\trsync qgis-$version.tar.bz2* ssh.qgis.org:/var/www/downloads/\n\n";
 
 
 =head1 NAME