Commit d74a7b4c authored by justincohen's avatar justincohen Committed by Commit bot

Call status before reset in gclient sync.

Calling status before reset will ensure files that have no been changed do not
get deleted by reset --hard.

BUG=642711

Review-Url: https://codereview.chromium.org/2447813003
parent c3937b91
......@@ -534,6 +534,13 @@ class GitWrapper(SCMWrapper):
target = 'HEAD'
if options.upstream and upstream_branch:
target = upstream_branch
# Builds can create hard links which update source files' ctimes, causing
# git to become confused over what files are out-of-date. Calling
# `git status` resynchronizes git and allows `git reset --hard` to not
# re-checkout files (and thus forcing unnecessary rebuilds)".
self._Run(['status'], options)
self._Run(['reset', '--hard', target], options)
if current_type == 'detached':
......
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