Revert "Gclient: Don't check if repository is clean if --force is passed in"

gclient_scm.py

Index: gclient_scm.py
diff --git a/gclient_scm.py b/gclient_scm.py
index 79fb6ea58f2fa9d34d9e6b1c08ea97e3aadf5c41..9a6f5123419cef246e638dc28ae3caf0679cd4ee 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -553,9 +553,7 @@ class GitWrapper(SCMWrapper):
 
     if current_type == 'detached':
       # case 0
-      if not options.force:
-        # Don't do this check if nuclear option is on.
-        self._CheckClean(rev_str)
+      self._CheckClean(rev_str)
       self._CheckDetachedHead(rev_str, options)
       if self._Capture(['rev-list', '-n', '1', 'HEAD']) == revision:
         self.Print('Up-to-date; skipping checkout.')
@@ -565,7 +563,7 @@ class GitWrapper(SCMWrapper):
         self._Checkout(
             options,
             revision,
-            force=(options.force or options.delete_unversioned_trees),
+            force=(options.force and options.delete_unversioned_trees),
             quiet=True,
         )
       if not printed_path: