Commit cba3ea79 authored by John Budorick's avatar John Budorick Committed by Commit Bot

Generalize git index refresh to bot_update. (RELAND)

Reland of https://chromium-review.googlesource.com/c/580327/

TBR=iannucci@chromium.org
Bug: 746763
Change-Id: Icc3be87faa6c614a09b7406ce6e748abb2ad82da
Reviewed-on: https://chromium-review.googlesource.com/581268
Commit-Queue: John Budorick <jbudorick@chromium.org>
Reviewed-by: 's avatarJohn Budorick <jbudorick@chromium.org>
parent de86ab35
...@@ -1139,6 +1139,17 @@ def main(): ...@@ -1139,6 +1139,17 @@ def main():
solutions_printer(git_slns) 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: try:
# Dun dun dun, the main part of bot_update. # Dun dun dun, the main part of bot_update.
revisions, step_text, shallow = prepare(options, git_slns, active) revisions, step_text, shallow = prepare(options, git_slns, active)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment