Commit 3f0dacf0 authored by hinoka@chromium.org's avatar hinoka@chromium.org

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

Instead just do a git checkout --force, since there are some states that reset cannot fix.

BUG=606420

Review URL: https://codereview.chromium.org/1916973002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300176 0039d316-1c4b-4281-b951-d872f2087c98
parent 56d0de79
......@@ -553,7 +553,9 @@ class GitWrapper(SCMWrapper):
if current_type == 'detached':
# case 0
self._CheckClean(rev_str)
if not options.force:
# Don't do this check if nuclear option is on.
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.')
......@@ -563,7 +565,7 @@ class GitWrapper(SCMWrapper):
self._Checkout(
options,
revision,
force=(options.force and options.delete_unversioned_trees),
force=(options.force or options.delete_unversioned_trees),
quiet=True,
)
if not printed_path:
......
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