Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(473)

Unified Diff: scripts/slave/gclient_safe_revert.py

Issue 2444403003: Avoid unnecessary file churn by "git reset --hard" step. (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/gclient_safe_revert.py
diff --git a/scripts/slave/gclient_safe_revert.py b/scripts/slave/gclient_safe_revert.py
index fbe3f8c3b039b5e31a0698546abcee04a0931f42..c8e9bc75e4618e08a85c31db8ec581e8fd787376 100755
--- a/scripts/slave/gclient_safe_revert.py
+++ b/scripts/slave/gclient_safe_revert.py
@@ -43,6 +43,10 @@ def main():
'if [ -e .git ]; then git remote update; fi']
chromium_utils.RunCommand(cmd, cwd=build_directory)
+ # Work around http://crbug.com/642711
+ cmd = [gclient_command, 'recurse', '-v', 'git', 'update-index', '--refresh']
+ chromium_utils.RunCommand(cmd, cwd=build_directory)
+
cmd = [gclient_command, 'revert', '-v', '-v', '-v', '--nohooks', '--upstream']
return chromium_utils.RunCommand(cmd, cwd=build_directory)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698