diff options
author | axis <qt-info@nokia.com> | 2011-03-31 11:36:18 +0200 |
---|---|---|
committer | axis <qt-info@nokia.com> | 2011-03-31 17:27:39 +0200 |
commit | b9ade9046493db3f31f6ddfe03c67343cb8d5394 (patch) | |
tree | ce917704535a3602694ae219208690d3f5c8a224 | |
parent | b4b08561c00743707520b373323ce120c21c4557 (diff) |
Fixed sync.profile dependency data not being pushed to the server.
Also switched from <module> remote names to "origin" remote names,
since this is more in line with what Git would do if you cloned the
repository, and it makes pushing easier.
-rw-r--r-- | scripts/905_git_split | 10 | ||||
-rw-r--r-- | scripts/950_pulse_dep_tree | 11 |
2 files changed, 16 insertions, 5 deletions
diff --git a/scripts/905_git_split b/scripts/905_git_split index 59f8b4e..6d16c2d 100644 --- a/scripts/905_git_split +++ b/scripts/905_git_split @@ -78,8 +78,9 @@ foreach my $module (@repos) { # push modules to the server if ($run_push) { print("Pushing modules repo to server: $module\n"); - run("git remote add $module git\@scm.dev.nokia.troll.no:qt/$module.git"); - run("GIT_FORCE=yes-please GIT_PUSH=size,generated,crlf,conflict,giant,alien git push $module +master"); + 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 branch --set-upstream master origin/master"); } chdir($qtdir); } @@ -148,8 +149,9 @@ run("git commit -m \"Long live the qt-bundle Qt repository\" --author \"Qt by No # push qt-bundle to the server if ($run_push) { print("Pushing qt-bundle repo to server:\n"); - run("git remote add qt-bundle 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 qt-bundle +master"); + 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 branch --set-upstream master origin/master"); } return 1; diff --git a/scripts/950_pulse_dep_tree b/scripts/950_pulse_dep_tree index ff74fc6..497da7a 100644 --- a/scripts/950_pulse_dep_tree +++ b/scripts/950_pulse_dep_tree @@ -151,7 +151,15 @@ sub resolveAndCommitDependencies { run("git add $syncProInsideRepo"); run("git commit -q --author=\"axis <qt-info\@nokia.com>\" " . "-m \"Added dependency information to the sync.profile.\""); - my $committedSha = `git rev-parse HEAD`; + my $committedSha; + if ($repo eq "qtwebkit") { + # In the case of webkit, use latest revision, since we cannot publish SHAs without going through + # the WebKit contribution process. + $committedSha = "LATEST_REVISION"; + } else { + run("git push origin master") if ($run_push); + $committedSha = `git rev-parse HEAD`; + } chdir(".."); foreach my $sameSyncProfileModule (@sameSyncProfileModules) { @@ -165,5 +173,6 @@ foreach my $dep (keys %deps) { run("git commit -aq --author=\"axis <qt-info\@nokia.com>\" " . "-m \"Committed dependency information to all modules.\""); +run("git push origin master") if ($run_push); return 1; |