summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2011-04-05 11:16:44 +0200
committeraxis <qt-info@nokia.com>2011-04-05 11:16:44 +0200
commit6252dbd9c139c162dbb93175694a36a2aa6b8f3a (patch)
tree737318368eab666e815bb93f9fd846e53ef66462
parent7ac850831dcc80c98d2b58499f31ac914d8de12e (diff)
Added "style" to GIT_PUSH options.
It omits the style check, and so makes the push a little faster. Other checks, like size and generated, are still run.
-rw-r--r--scripts/905_git_split4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/905_git_split b/scripts/905_git_split
index aed1f73..0e954bc 100644
--- a/scripts/905_git_split
+++ b/scripts/905_git_split
@@ -113,7 +113,7 @@ foreach my $module (@repos) {
chdir($o);
print("Pushing modules repo to server: $module\n");
run("git remote add origin git\@scm.dev.nokia.troll.no:qt/$module.git");
- run("GIT_FORCE=yes-please GIT_PUSH=size,generated,crlf,conflict,giant,alien git push origin +master");
+ run("GIT_FORCE=yes-please GIT_PUSH=size,generated,crlf,conflict,giant,alien,style git push origin +master");
run("git branch --set-upstream master origin/master");
}
chdir($qtdir);
@@ -184,7 +184,7 @@ run("git commit -m \"Long live the qt-bundle Qt repository\" --author \"Qt by No
if ($run_push) {
print("Pushing qt-bundle repo to server:\n");
run("git remote add origin git\@scm.dev.nokia.troll.no:qt/qt-bundle.git");
- run("GIT_FORCE=yes-please GIT_PUSH=size,generated,crlf,conflict,giant,alien git push origin +master");
+ run("GIT_FORCE=yes-please GIT_PUSH=size,generated,crlf,conflict,giant,alien,style git push origin +master");
run("git branch --set-upstream master origin/master");
}