From 06e1aa0769771434750fc4ea80f87db84ca8acc6 Mon Sep 17 00:00:00 2001 From: John Budorick Date: Thu, 20 Jul 2017 18:08:18 -0700 Subject: [PATCH] Generalize git index refresh to bot_update. Bug: 746763 Change-Id: Id0cc8fd672421fe4049334077c6d1e63800524ee Reviewed-on: https://chromium-review.googlesource.com/580327 Commit-Queue: John Budorick Reviewed-by: Robbie Iannucci --- .../recipe_modules/bot_update/resources/bot_update.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/recipes/recipe_modules/bot_update/resources/bot_update.py b/recipes/recipe_modules/bot_update/resources/bot_update.py index 8b5943942..2d885273d 100755 --- a/recipes/recipe_modules/bot_update/resources/bot_update.py +++ b/recipes/recipe_modules/bot_update/resources/bot_update.py @@ -1139,6 +1139,17 @@ def main(): solutions_printer(git_slns) + # Creating hardlinks during a build can interact with git reset in + # unfortunate ways if git's index isn't refreshed beforehand. (See + # crbug.com/330461#c13 for an explanation.) + try: + call_gclient(['recurse', '-v', 'git', 'update-index', '--refresh']) + except SubprocessFailed: + # Failure here (and nowhere else) may have adverse effects on the + # compile time of the build but shouldn't affect its ability to + # successfully complete. + print 'WARNING: Failed to update git indices.' + try: # Dun dun dun, the main part of bot_update. revisions, step_text, shallow = prepare(options, git_slns, active)