From d74a7b4c14512d95cb46204bb7a70ba5666b5eb7 Mon Sep 17 00:00:00 2001
From: justincohen <justincohen@chromium.org>
Date: Tue, 25 Oct 2016 17:46:04 -0700
Subject: [PATCH] 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
---
 gclient_scm.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gclient_scm.py b/gclient_scm.py
index 4a4e60154..49e53f6bf 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -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':