commit eafef3b33eb8e1a6d7f65fb35dcb039f6dc0abf3
author msb@chromium.org <msb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon Jan 25 17:42:27 2010 +0000
committer msb@chromium.org <msb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon Jan 25 17:42:27 2010 +0000
tree 315a3dd02b86578ab96a303f25d02c3f5e872e32
parent 3904caa959c7a5a3cc9ac7a419033d404b8b873b

Use --force to reset a git repo before attempting to rebase during gclient sync/update

Patch Contributed By: Nasser Grainawi <nasser@codeaurora.org>

Review URL: http://codereview.chromium.org/548079

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@37020 0039d316-1c4b-4281-b951-d872f2087c98

gclient_scm.py

diff --git a/gclient_scm.py b/gclient_scm.py
index 8380b34..955c35d 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -213,6 +213,8 @@
     self._Run(['remote', 'update'], redirect_stdout=False)
     files = self._Run(['diff', new_base, '--name-only']).split()
     file_list.extend([os.path.join(self.checkout_path, f) for f in files])
+    if options.force:
+      self._Run(['reset', '--hard', merge_base], redirect_stdout=False)
     self._Run(['rebase', '-v', '--onto', new_base, merge_base, cur_branch],
                 redirect_stdout=False, checkrc=False)