Title: [111204] trunk/Tools
- Revision
- 111204
- Author
- [email protected]
- Date
- 2012-03-19 10:52:18 -0700 (Mon, 19 Mar 2012)
Log Message
Optimize the cleanup sequence in the start-queue.sh script
https://github.com/abarth/webkit/pull/1
Patch by David Michael Barr <[email protected]> on 2012-03-19
Reviewed by Adam Barth.
Updating the working copy is an expensive operation
for a repository the size of WebKit.
Attempt to reset only to the target revision.
* EWSTools/start-queue.sh:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (111203 => 111204)
--- trunk/Tools/ChangeLog 2012-03-19 17:46:06 UTC (rev 111203)
+++ trunk/Tools/ChangeLog 2012-03-19 17:52:18 UTC (rev 111204)
@@ -1,3 +1,16 @@
+2012-03-19 David Michael Barr <[email protected]>
+
+ Optimize the cleanup sequence in the start-queue.sh script
+ https://github.com/abarth/webkit/pull/1
+
+ Reviewed by Adam Barth.
+
+ Updating the working copy is an expensive operation
+ for a repository the size of WebKit.
+ Attempt to reset only to the target revision.
+
+ * EWSTools/start-queue.sh:
+
2012-03-19 Raphael Kubo da Costa <[email protected]>
Adjust architecture type of the EFL build bot.
Modified: trunk/Tools/EWSTools/start-queue.sh (111203 => 111204)
--- trunk/Tools/EWSTools/start-queue.sh 2012-03-19 17:46:06 UTC (rev 111203)
+++ trunk/Tools/EWSTools/start-queue.sh 2012-03-19 17:52:18 UTC (rev 111204)
@@ -47,12 +47,10 @@
do
# This somewhat quirky sequence of steps seems to clear up all the broken
# git situations we've gotten ourself into in the past.
- git reset --hard HEAD # Throw away any patches in our tree.
git clean -f # Remove any left-over layout test results, added files, etc.
git rebase --abort # If we got killed during a git rebase, we need to clean up.
- git checkout HEAD^ # Move to a detached head so we can blow away master.
- git branch -D master # Blow away master in case it has diverged from origin/master.
- git checkout origin/master -b master # Re-create master from origin/master.
+ git fetch origin # Avoid updating the working copy to a stale revision.
+ git checkout origin/master -fB master # Re-create master from origin/master.
# Most queues auto-update as part of their normal operation, but updating
# here makes sure that we get the latest version of the master process.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
