summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2011-04-05 15:49:41 +0200
committeraxis <qt-info@nokia.com>2011-04-05 15:50:25 +0200
commit1af6afaa5262e0d1f807b927806a69b7b704bc62 (patch)
treed5c2fce8f8770bf83ad1900a06285e553f88fa3d /scripts
parent3cfa862de9ee7eac64b75d5306d8cc055382cb0f (diff)
Avoid referencing unknown webkit commits from the mother repo.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/950_pulse_dep_tree5
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/950_pulse_dep_tree b/scripts/950_pulse_dep_tree
index 4a41f12..ac91d08 100644
--- a/scripts/950_pulse_dep_tree
+++ b/scripts/950_pulse_dep_tree
@@ -156,6 +156,9 @@ sub resolveAndCommitDependencies {
# In the case of webkit, use latest revision, since we cannot publish SHAs without going through
# the WebKit contribution process.
$committedSha = "LATEST_REVISION";
+ # Also, go back one commit, because we don't want the newly generated commit to be referenced in
+ # the mother repo.
+ run("git checkout -q master~1");
} else {
run("git push origin master") if ($run_push);
$committedSha = `git rev-parse HEAD`;
@@ -175,4 +178,6 @@ 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);
+run("cd qtwebkit && git checkout -q master");
+
return 1;